diff options
Diffstat (limited to 'ext/gmp')
46 files changed, 87 insertions, 807 deletions
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 716165078f..52bb962db2 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -99,10 +99,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_prob_prime, 0, 0, 1) ZEND_ARG_INFO(0, reps) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random, 0, 0, 0) - ZEND_ARG_INFO(0, limiter) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_gmp_random_seed, 0, 0, 1) ZEND_ARG_INFO(0, seed) ZEND_END_ARG_INFO() @@ -175,7 +171,6 @@ static const zend_function_entry gmp_functions[] = { ZEND_FE(gmp_kronecker, arginfo_gmp_binary) ZEND_FE(gmp_cmp, arginfo_gmp_binary) ZEND_FE(gmp_sign, arginfo_gmp_unary) - ZEND_DEP_FE(gmp_random, arginfo_gmp_random) ZEND_FE(gmp_random_seed, arginfo_gmp_random_seed) ZEND_FE(gmp_random_bits, arginfo_gmp_random_bits) ZEND_FE(gmp_random_range, arginfo_gmp_random_range) @@ -409,24 +404,24 @@ static inline void gmp_create(zval *target, mpz_ptr *gmpnum_target) /* {{{ */ } /* }}} */ -static int gmp_cast_object(zval *readobj, zval *writeobj, int type) /* {{{ */ +static int gmp_cast_object(zend_object *readobj, zval *writeobj, int type) /* {{{ */ { mpz_ptr gmpnum; switch (type) { case IS_STRING: - gmpnum = GET_GMP_FROM_ZVAL(readobj); + gmpnum = GET_GMP_OBJECT_FROM_OBJ(readobj)->num; gmp_strval(writeobj, gmpnum, 10); return SUCCESS; case IS_LONG: - gmpnum = GET_GMP_FROM_ZVAL(readobj); + gmpnum = GET_GMP_OBJECT_FROM_OBJ(readobj)->num; ZVAL_LONG(writeobj, mpz_get_si(gmpnum)); return SUCCESS; case IS_DOUBLE: - gmpnum = GET_GMP_FROM_ZVAL(readobj); + gmpnum = GET_GMP_OBJECT_FROM_OBJ(readobj)->num; ZVAL_DOUBLE(writeobj, mpz_get_d(gmpnum)); return SUCCESS; case _IS_NUMBER: - gmpnum = GET_GMP_FROM_ZVAL(readobj); + gmpnum = GET_GMP_OBJECT_FROM_OBJ(readobj)->num; if (mpz_fits_slong_p(gmpnum)) { ZVAL_LONG(writeobj, mpz_get_si(gmpnum)); } else { @@ -439,10 +434,10 @@ static int gmp_cast_object(zval *readobj, zval *writeobj, int type) /* {{{ */ } /* }}} */ -static HashTable *gmp_get_debug_info(zval *obj, int *is_temp) /* {{{ */ +static HashTable *gmp_get_debug_info(zend_object *obj, int *is_temp) /* {{{ */ { HashTable *ht, *props = zend_std_get_properties(obj); - mpz_ptr gmpnum = GET_GMP_FROM_ZVAL(obj); + mpz_ptr gmpnum = GET_GMP_OBJECT_FROM_OBJ(obj)->num; zval zv; *is_temp = 1; @@ -455,10 +450,10 @@ static HashTable *gmp_get_debug_info(zval *obj, int *is_temp) /* {{{ */ } /* }}} */ -static zend_object *gmp_clone_obj(zval *obj) /* {{{ */ +static zend_object *gmp_clone_obj(zend_object *obj) /* {{{ */ { - gmp_object *old_object = GET_GMP_OBJECT_FROM_ZVAL(obj); - gmp_object *new_object = GET_GMP_OBJECT_FROM_OBJ(gmp_create_object(Z_OBJCE_P(obj))); + gmp_object *old_object = GET_GMP_OBJECT_FROM_OBJ(obj); + gmp_object *new_object = GET_GMP_OBJECT_FROM_OBJ(gmp_create_object(obj->ce)); zend_objects_clone_members( &new_object->std, &old_object->std); @@ -579,7 +574,7 @@ static int gmp_serialize(zval *object, unsigned char **buffer, size_t *buf_len, php_var_serialize(&buf, &zv, &serialize_data); zval_ptr_dtor_str(&zv); - ZVAL_ARR(&zv, zend_std_get_properties(object)); + ZVAL_ARR(&zv, zend_std_get_properties(Z_OBJ_P(object))); php_var_serialize(&buf, &zv, &serialize_data); PHP_VAR_SERIALIZE_DESTROY(serialize_data); @@ -598,14 +593,12 @@ static int gmp_unserialize(zval *object, zend_class_entry *ce, const unsigned ch zval *zv; int retval = FAILURE; php_unserialize_data_t unserialize_data; - zval object_copy; + zend_object *zobj; PHP_VAR_UNSERIALIZE_INIT(unserialize_data); gmp_create(object, &gmpnum); - /* The "object" variable may be modified during the execution of this unserialize handler - * (it may turn into a reference). Keep the original object around for further operations. */ - ZVAL_OBJ(&object_copy, Z_OBJ_P(object)); + zobj = Z_OBJ_P(object); p = buf; max = buf + buf_len; @@ -629,7 +622,7 @@ static int gmp_unserialize(zval *object, zend_class_entry *ce, const unsigned ch if (zend_hash_num_elements(Z_ARRVAL_P(zv)) != 0) { zend_hash_copy( - zend_std_get_properties(&object_copy), Z_ARRVAL_P(zv), + zend_std_get_properties(zobj), Z_ARRVAL_P(zv), (copy_ctor_func_t) zval_add_ref ); } @@ -1879,28 +1872,6 @@ static void gmp_init_random(void) } } -/* {{{ proto GMP gmp_random([int limiter]) - Gets random number */ -ZEND_FUNCTION(gmp_random) -{ - zend_long limiter = 20; - mpz_ptr gmpnum_result; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &limiter) == FAILURE) { - return; - } - - INIT_GMP_RETVAL(gmpnum_result); - gmp_init_random(); - -#ifdef GMP_LIMB_BITS - mpz_urandomb(gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); -#else - mpz_urandomb(gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); -#endif -} -/* }}} */ - /* {{{ proto GMP gmp_random_seed(mixed seed) Seed the RNG */ ZEND_FUNCTION(gmp_random_seed) diff --git a/ext/gmp/tests/gmp_abs.phpt b/ext/gmp/tests/gmp_abs.phpt index 811ab3d5ee..236acc4684 100644 --- a/ext/gmp/tests/gmp_abs.phpt +++ b/ext/gmp/tests/gmp_abs.phpt @@ -15,8 +15,6 @@ var_dump(gmp_strval(gmp_abs("0000"))); var_dump(gmp_strval(gmp_abs("09876543"))); var_dump(gmp_strval(gmp_abs("-099987654"))); -var_dump(gmp_abs()); -var_dump(gmp_abs(1,2)); var_dump(gmp_abs(array())); echo "Done\n"; @@ -39,12 +37,6 @@ string(1) "0" Warning: gmp_abs(): Unable to convert variable to GMP - string is not an integer in %s on line %d string(1) "0" -Warning: gmp_abs() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_abs() expects exactly 1 parameter, 2 given in %s on line %d -NULL - Warning: gmp_abs(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) Done diff --git a/ext/gmp/tests/gmp_and.phpt b/ext/gmp/tests/gmp_and.phpt index 2fb27c3e70..b582a6b480 100644 --- a/ext/gmp/tests/gmp_and.phpt +++ b/ext/gmp/tests/gmp_and.phpt @@ -17,8 +17,6 @@ var_dump(gmp_strval(gmp_and($n, "34332"))); $n1 = gmp_init("987657878765436543456"); var_dump(gmp_strval(gmp_and($n, $n1))); -var_dump(gmp_and($n, $n1, 1)); -var_dump(gmp_and(1)); var_dump(gmp_and(array(), 1)); var_dump(gmp_and(1, array())); var_dump(gmp_and(array(), array())); @@ -37,12 +35,6 @@ string(1) "0" string(4) "1536" string(15) "424703623692768" -Warning: gmp_and() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_and() expects exactly 2 parameters, 1 given in %s on line %d -NULL - Warning: gmp_and(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_clrbit.phpt b/ext/gmp/tests/gmp_clrbit.phpt index 0aab89dd37..255b9947b9 100644 --- a/ext/gmp/tests/gmp_clrbit.phpt +++ b/ext/gmp/tests/gmp_clrbit.phpt @@ -28,10 +28,11 @@ gmp_clrbit($n, 20); var_dump(gmp_strval($n)); $n = array(); -gmp_clrbit($n, 3); -gmp_clrbit($n, 3, 1); -gmp_clrbit($n); -gmp_clrbit(); +try { + gmp_clrbit($n, 3); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} echo "Done\n"; ?> @@ -46,12 +47,5 @@ Warning: gmp_clrbit(): Index must be greater than or equal to zero in %s on line string(7) "1000000" string(7) "1000000" string(30) "238462734628347239571822592658" - -Warning: gmp_clrbit() expects parameter 1 to be GMP, array given in %s on line %d - -Warning: gmp_clrbit() expects exactly 2 parameters, 3 given in %s on line %d - -Warning: gmp_clrbit() expects exactly 2 parameters, 1 given in %s on line %d - -Warning: gmp_clrbit() expects exactly 2 parameters, 0 given in %s on line %d +gmp_clrbit() expects parameter 1 to be GMP, array given Done diff --git a/ext/gmp/tests/gmp_cmp.phpt b/ext/gmp/tests/gmp_cmp.phpt index 2e48d3b83b..4748e7db87 100644 --- a/ext/gmp/tests/gmp_cmp.phpt +++ b/ext/gmp/tests/gmp_cmp.phpt @@ -17,10 +17,7 @@ var_dump(gmp_cmp(0,$n) < 0); $n1 = gmp_init("827278512385463739"); var_dump(gmp_cmp($n1,$n)); -var_dump(gmp_cmp($n1,$n,1)); var_dump(gmp_cmp(array(),array())); -var_dump(gmp_cmp(array())); -var_dump(gmp_cmp()); echo "Done\n"; ?> @@ -34,15 +31,6 @@ int(-1) bool(true) int(0) -Warning: gmp_cmp() expects exactly 2 parameters, 3 given in %s on line %d -NULL - Warning: gmp_cmp(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_cmp() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_cmp() expects exactly 2 parameters, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_com.phpt b/ext/gmp/tests/gmp_com.phpt index ae6ec59200..97299dd064 100644 --- a/ext/gmp/tests/gmp_com.phpt +++ b/ext/gmp/tests/gmp_com.phpt @@ -19,7 +19,6 @@ $n = gmp_init("98765463337"); var_dump(gmp_strval(gmp_com($n))); var_dump(gmp_strval(gmp_com(array()))); -var_dump(gmp_strval(gmp_com())); echo "Done\n"; ?> @@ -38,9 +37,4 @@ string(12) "-98765463338" Warning: gmp_com(): Unable to convert variable to GMP - wrong type in %s on line %d string(1) "0" - -Warning: gmp_com() expects exactly 1 parameter, 0 given in %s on line %d - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) Done diff --git a/ext/gmp/tests/gmp_div_q.phpt b/ext/gmp/tests/gmp_div_q.phpt index afc64c3547..9fd94efdac 100644 --- a/ext/gmp/tests/gmp_div_q.phpt +++ b/ext/gmp/tests/gmp_div_q.phpt @@ -5,9 +5,6 @@ gmp_div_q() tests --FILE-- <?php -var_dump(gmp_div_q()); -var_dump(gmp_div_q("")); - var_dump(gmp_div_q(0,1)); var_dump(gmp_div_q(1,0)); var_dump(gmp_div_q(12653,23482734)); @@ -27,11 +24,6 @@ var_dump(gmp_div_q(array(), array())); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_div_q() expects at least 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_div_q() expects at least 2 parameters, 1 given in %s on line %d -NULL object(GMP)#%d (1) { ["num"]=> string(1) "0" diff --git a/ext/gmp/tests/gmp_div_qr.phpt b/ext/gmp/tests/gmp_div_qr.phpt index 936fbc6ef1..373beb5701 100644 --- a/ext/gmp/tests/gmp_div_qr.phpt +++ b/ext/gmp/tests/gmp_div_qr.phpt @@ -5,9 +5,6 @@ gmp_div_qr() tests --FILE-- <?php -var_dump(gmp_div_qr()); -var_dump(gmp_div_qr("")); - var_dump(gmp_div_qr(0,1)); var_dump(gmp_div_qr(1,0)); var_dump(gmp_div_qr(gmp_init(1), gmp_init(0))); @@ -29,11 +26,6 @@ var_dump(gmp_div_qr(array(), array())); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_div_qr() expects at least 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_div_qr() expects at least 2 parameters, 1 given in %s on line %d -NULL array(2) { [0]=> object(GMP)#%d (1) { diff --git a/ext/gmp/tests/gmp_div_r.phpt b/ext/gmp/tests/gmp_div_r.phpt index bab243e465..2b19ed1f48 100644 --- a/ext/gmp/tests/gmp_div_r.phpt +++ b/ext/gmp/tests/gmp_div_r.phpt @@ -5,9 +5,6 @@ gmp_div_r() tests --FILE-- <?php -var_dump(gmp_div_r()); -var_dump(gmp_div_r("")); - var_dump($r = gmp_div_r(0,1)); var_dump($r = gmp_div_r(1,0)); var_dump($r = gmp_div_r(12653,23482734)); @@ -27,11 +24,6 @@ var_dump(gmp_div_r(array(), array())); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_div_r() expects at least 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_div_r() expects at least 2 parameters, 1 given in %s on line %d -NULL object(GMP)#%d (1) { ["num"]=> string(1) "0" diff --git a/ext/gmp/tests/gmp_divexact.phpt b/ext/gmp/tests/gmp_divexact.phpt index 53f0c677ab..c6183cb734 100644 --- a/ext/gmp/tests/gmp_divexact.phpt +++ b/ext/gmp/tests/gmp_divexact.phpt @@ -10,9 +10,6 @@ if (!defined('GMP_VERSION') || version_compare("4.2.1", GMP_VERSION, ">=")) { --FILE-- <?php -var_dump(gmp_divexact(1, 1, 1)); -var_dump(gmp_divexact()); - $r = gmp_divexact("233", "23345555555555555555555555"); var_dump(gmp_strval($r)); @@ -39,11 +36,6 @@ var_dump(gmp_strval($r)); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_divexact() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_divexact() expects exactly 2 parameters, 0 given in %s on line %d -NULL string(1) "0" Warning: gmp_divexact(): Zero operand not allowed in %s on line %d diff --git a/ext/gmp/tests/gmp_export.phpt b/ext/gmp/tests/gmp_export.phpt index 52449ecf0a..bbc26d086c 100644 --- a/ext/gmp/tests/gmp_export.phpt +++ b/ext/gmp/tests/gmp_export.phpt @@ -50,9 +50,6 @@ foreach ($export as $k => $test) { var_dump($passed); -// Invalid arguments (zpp failure) -var_dump(gmp_export()); - // Invalid word sizes var_dump(gmp_export(123, -1)); var_dump(gmp_export(123, 0)); @@ -63,9 +60,6 @@ var_dump(gmp_export(123, 1, GMP_BIG_ENDIAN | GMP_LITTLE_ENDIAN)); --EXPECTF-- bool(true) -Warning: gmp_export() expects at least 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_export(): Word size must be positive, -1 given in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_fact.phpt b/ext/gmp/tests/gmp_fact.phpt index 032f735435..d861fae40e 100644 --- a/ext/gmp/tests/gmp_fact.phpt +++ b/ext/gmp/tests/gmp_fact.phpt @@ -21,8 +21,6 @@ var_dump(gmp_strval(gmp_fact($n))); $n = gmp_init(-10); var_dump(gmp_strval(gmp_fact($n))); -var_dump(gmp_fact()); -var_dump(gmp_fact(1,1)); var_dump(gmp_fact(array())); var_dump(gmp_strval(gmp_fact(array()))); @@ -50,12 +48,6 @@ string(9) "479001600" Warning: gmp_fact(): Number has to be greater than or equal to 0 in %s on line %d string(1) "0" -Warning: gmp_fact() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_fact() expects exactly 1 parameter, 2 given in %s on line %d -NULL - Warning: gmp_fact(): Number has to be an integer in %s on line %d object(GMP)#%d (1) { ["num"]=> diff --git a/ext/gmp/tests/gmp_gcd.phpt b/ext/gmp/tests/gmp_gcd.phpt index cf4eac9e92..4e130a1fd9 100644 --- a/ext/gmp/tests/gmp_gcd.phpt +++ b/ext/gmp/tests/gmp_gcd.phpt @@ -21,13 +21,10 @@ $n = gmp_init("8127346234"); var_dump(gmp_strval(gmp_gcd($n,$n))); $n = gmp_init("8127346234"); var_dump(gmp_strval(gmp_gcd($n,0))); -var_dump(gmp_gcd($n,$n,1)); -var_dump(gmp_gcd($n,array(),1)); -var_dump(gmp_gcd(array(),$n,1)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(1) "3" string(5) "12387" string(3) "224" @@ -39,13 +36,4 @@ string(1) "2" string(1) "1" string(10) "8127346234" string(10) "8127346234" - -Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_gcd() expects exactly 2 parameters, 3 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_gcdext.phpt b/ext/gmp/tests/gmp_gcdext.phpt index 4adecf25d2..d02f341129 100644 --- a/ext/gmp/tests/gmp_gcdext.phpt +++ b/ext/gmp/tests/gmp_gcdext.phpt @@ -31,9 +31,6 @@ foreach ($a as $val) { var_dump(gmp_gcdext($val[0],array())); var_dump(gmp_gcdext(array(),array())); -var_dump(gmp_gcdext(array(),array(),1)); -var_dump(gmp_gcdext(array())); -var_dump(gmp_gcdext()); echo "Done\n"; ?> @@ -64,13 +61,4 @@ bool(false) Warning: gmp_gcdext(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_gcdext() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_gcdext() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_gcdext() expects exactly 2 parameters, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_hamdist.phpt b/ext/gmp/tests/gmp_hamdist.phpt index 60ef89f84d..7057c5f32a 100644 --- a/ext/gmp/tests/gmp_hamdist.phpt +++ b/ext/gmp/tests/gmp_hamdist.phpt @@ -16,11 +16,9 @@ var_dump(gmp_hamdist($n, "8333765434567897654333334567")); var_dump(gmp_hamdist($n, $n)); var_dump(gmp_hamdist($n, $n1)); -var_dump(gmp_hamdist($n, $n1, 1)); var_dump(gmp_hamdist($n, array())); var_dump(gmp_hamdist(array(), $n)); var_dump(gmp_hamdist(array(), array())); -var_dump(gmp_hamdist()); echo "Done\n"; ?> @@ -33,9 +31,6 @@ int(43) int(0) int(26) -Warning: gmp_hamdist() expects exactly 2 parameters, 3 given in %s on line %d -NULL - Warning: gmp_hamdist(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) @@ -44,7 +39,4 @@ bool(false) Warning: gmp_hamdist(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_hamdist() expects exactly 2 parameters, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_import.phpt b/ext/gmp/tests/gmp_import.phpt index a9e9314483..b3c4e0154a 100644 --- a/ext/gmp/tests/gmp_import.phpt +++ b/ext/gmp/tests/gmp_import.phpt @@ -47,9 +47,6 @@ foreach ($import as $k => $test) { var_dump($passed); -// Invalid arguments (zpp failure) -var_dump(gmp_import()); - // Invalid word sizes var_dump(gmp_import('a', -1)); var_dump(gmp_import('a', 0)); @@ -65,9 +62,6 @@ var_dump(gmp_import('a', 1, GMP_BIG_ENDIAN | GMP_LITTLE_ENDIAN)); --EXPECTF-- bool(true) -Warning: gmp_import() expects at least 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_import(): Word size must be positive, -1 given in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_init.phpt b/ext/gmp/tests/gmp_init.phpt index a35f12345c..7da7c8e55e 100644 --- a/ext/gmp/tests/gmp_init.phpt +++ b/ext/gmp/tests/gmp_init.phpt @@ -7,9 +7,6 @@ gmp_init() basic tests var_dump(gmp_init("98765678")); var_dump(gmp_strval(gmp_init("98765678"))); -var_dump(gmp_strval(gmp_init())); -var_dump(gmp_init()); -var_dump(gmp_init(1,2,3,4)); var_dump(gmp_init(1,-1)); var_dump(gmp_init("",36)); var_dump(gmp_init("foo",3)); @@ -24,17 +21,6 @@ object(GMP)#%d (1) { } string(8) "98765678" -Warning: gmp_init() expects at least 1 parameter, 0 given in %s on line %d - -Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d -bool(false) - -Warning: gmp_init() expects at least 1 parameter, 0 given in %s on line %d -NULL - -Warning: gmp_init() expects at most 2 parameters, 4 given in %s on line %d -NULL - Warning: gmp_init(): Bad base for conversion: -1 (should be between 2 and %d) in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_intval.phpt b/ext/gmp/tests/gmp_intval.phpt index f30b391573..019ab3d070 100644 --- a/ext/gmp/tests/gmp_intval.phpt +++ b/ext/gmp/tests/gmp_intval.phpt @@ -5,7 +5,6 @@ gmp_intval() tests --FILE-- <?php -var_dump(gmp_intval(1,1)); var_dump(gmp_intval("")); var_dump(gmp_intval(1.0001)); var_dump(gmp_intval("1.0001")); @@ -25,8 +24,6 @@ var_dump(gmp_intval($g)); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_intval() expects exactly 1 parameter, 2 given in %s on line %d -NULL int(0) int(1) int(1) diff --git a/ext/gmp/tests/gmp_invert.phpt b/ext/gmp/tests/gmp_invert.phpt index 8c1d7c577c..40793afd53 100644 --- a/ext/gmp/tests/gmp_invert.phpt +++ b/ext/gmp/tests/gmp_invert.phpt @@ -19,8 +19,6 @@ $n1 = gmp_init("3498273496234234523451"); var_dump(gmp_strval(gmp_invert($n, $n1))); var_dump(gmp_strval(gmp_invert($n1, $n))); -var_dump(gmp_invert($n1, $n, 10)); -var_dump(gmp_invert($n1)); var_dump(gmp_invert(array(), 1)); var_dump(gmp_invert(1, array())); var_dump(gmp_invert(array(), array())); @@ -38,12 +36,6 @@ string(1) "0" string(22) "3498273496234234523441" string(1) "1" -Warning: gmp_invert() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_invert() expects exactly 2 parameters, 1 given in %s on line %d -NULL - Warning: gmp_invert(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_jacobi.phpt b/ext/gmp/tests/gmp_jacobi.phpt index da92b87401..2040b666f6 100644 --- a/ext/gmp/tests/gmp_jacobi.phpt +++ b/ext/gmp/tests/gmp_jacobi.phpt @@ -24,10 +24,6 @@ var_dump(gmp_jacobi(3, array())); var_dump(gmp_jacobi(array(), 3)); var_dump(gmp_jacobi(array(), array())); -var_dump(gmp_jacobi(array(), array(), 1)); -var_dump(gmp_jacobi(array())); -var_dump(gmp_jacobi()); - echo "Done\n"; ?> --EXPECTF-- @@ -57,13 +53,4 @@ bool(false) Warning: gmp_jacobi(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_jacobi() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_jacobi() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_jacobi() expects exactly 2 parameters, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_legendre.phpt b/ext/gmp/tests/gmp_legendre.phpt index 71191e133d..6b6197f25a 100644 --- a/ext/gmp/tests/gmp_legendre.phpt +++ b/ext/gmp/tests/gmp_legendre.phpt @@ -24,10 +24,6 @@ var_dump(gmp_legendre(3, array())); var_dump(gmp_legendre(array(), 3)); var_dump(gmp_legendre(array(), array())); -var_dump(gmp_legendre(array(), array(), 1)); -var_dump(gmp_legendre(array())); -var_dump(gmp_legendre()); - echo "Done\n"; ?> --EXPECTF-- @@ -57,13 +53,4 @@ bool(false) Warning: gmp_legendre(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_legendre() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_legendre() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_legendre() expects exactly 2 parameters, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_mod.phpt b/ext/gmp/tests/gmp_mod.phpt index 4f216965c9..135c2ca11c 100644 --- a/ext/gmp/tests/gmp_mod.phpt +++ b/ext/gmp/tests/gmp_mod.phpt @@ -5,8 +5,6 @@ gmp_mod tests() --FILE-- <?php -var_dump(gmp_mod()); -var_dump(gmp_mod("")); var_dump(gmp_mod("","")); var_dump(gmp_mod(0,1)); var_dump(gmp_mod(0,-1)); @@ -22,12 +20,6 @@ var_dump(gmp_mod($a, $b)); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_mod() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_mod() expects exactly 2 parameters, 1 given in %s on line %d -NULL - Warning: gmp_mod(): Unable to convert variable to GMP - string is not an integer in %s on line %d bool(false) object(GMP)#%d (1) { diff --git a/ext/gmp/tests/gmp_neg.phpt b/ext/gmp/tests/gmp_neg.phpt index c457fa6574..777de69105 100644 --- a/ext/gmp/tests/gmp_neg.phpt +++ b/ext/gmp/tests/gmp_neg.phpt @@ -17,8 +17,6 @@ var_dump(gmp_intval(gmp_neg($n))); $n = gmp_init("12345678901234567890"); var_dump(gmp_strval(gmp_neg($n))); -var_dump(gmp_neg(1,1)); -var_dump(gmp_neg()); var_dump(gmp_neg(array())); echo "Done\n"; @@ -35,12 +33,6 @@ int(0) int(0) string(21) "-12345678901234567890" -Warning: gmp_neg() expects exactly 1 parameter, 2 given in %s on line %d -NULL - -Warning: gmp_neg() expects exactly 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_neg(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) Done diff --git a/ext/gmp/tests/gmp_or.phpt b/ext/gmp/tests/gmp_or.phpt index ef486df8e9..affd6ae5b8 100644 --- a/ext/gmp/tests/gmp_or.phpt +++ b/ext/gmp/tests/gmp_or.phpt @@ -17,8 +17,6 @@ var_dump(gmp_strval(gmp_or($n, "34332"))); $n1 = gmp_init("987657878765436543456"); var_dump(gmp_strval(gmp_or($n, $n1))); -var_dump(gmp_or($n, $n1, 1)); -var_dump(gmp_or(1)); var_dump(gmp_or(array(), 1)); var_dump(gmp_or(1, array())); var_dump(gmp_or(array(), array())); @@ -37,12 +35,6 @@ string(1) "0" string(15) "987657876576252" string(21) "987658441719689394144" -Warning: gmp_or() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_or() expects exactly 2 parameters, 1 given in %s on line %d -NULL - Warning: gmp_or(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_perfect_square.phpt b/ext/gmp/tests/gmp_perfect_square.phpt index 0f519c7b79..b477910378 100644 --- a/ext/gmp/tests/gmp_perfect_square.phpt +++ b/ext/gmp/tests/gmp_perfect_square.phpt @@ -21,7 +21,6 @@ var_dump(gmp_perfect_square($n)); $n = gmp_init(-5); var_dump(gmp_perfect_square($n)); -var_dump(gmp_perfect_square()); var_dump(gmp_perfect_square(array())); echo "Done\n"; @@ -39,9 +38,6 @@ bool(false) bool(true) bool(false) -Warning: gmp_perfect_square() expects exactly 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_perfect_square(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) Done diff --git a/ext/gmp/tests/gmp_popcount.phpt b/ext/gmp/tests/gmp_popcount.phpt index 26a7b5af8d..76dc2a89c0 100644 --- a/ext/gmp/tests/gmp_popcount.phpt +++ b/ext/gmp/tests/gmp_popcount.phpt @@ -13,7 +13,6 @@ var_dump(gmp_popcount("-23476123423433")); $n = gmp_init("9876546789222"); var_dump(gmp_popcount($n)); var_dump(gmp_popcount(array())); -var_dump(gmp_popcount()); echo "Done\n"; ?> @@ -27,7 +26,4 @@ int(20) Warning: gmp_popcount(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_popcount() expects exactly 1 parameter, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_pow.phpt b/ext/gmp/tests/gmp_pow.phpt index 5424d410a0..e9525867e1 100644 --- a/ext/gmp/tests/gmp_pow.phpt +++ b/ext/gmp/tests/gmp_pow.phpt @@ -21,11 +21,11 @@ var_dump(gmp_strval(gmp_pow($n,10))); $n = gmp_init("-20"); var_dump(gmp_strval(gmp_pow($n,10))); -var_dump(gmp_pow(2,10,1)); -var_dump(gmp_pow(2)); -var_dump(gmp_pow()); -var_dump(gmp_pow(array(), array())); -var_dump(gmp_pow(2,array())); +try { + var_dump(gmp_pow(2,array())); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} var_dump(gmp_pow(array(),10)); echo "Done\n"; @@ -47,21 +47,7 @@ Warning: gmp_pow(): Negative exponent not supported in %s on line %d string(1) "0" string(14) "10240000000000" string(14) "10240000000000" - -Warning: gmp_pow() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_pow() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_pow() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_pow() expects parameter 2 to be int, array given in %s on line %d -NULL - -Warning: gmp_pow() expects parameter 2 to be int, array given in %s on line %d -NULL +gmp_pow() expects parameter 2 to be int, array given Warning: gmp_pow(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_pown.phpt b/ext/gmp/tests/gmp_pown.phpt index b732aa331f..9a5b5deb11 100644 --- a/ext/gmp/tests/gmp_pown.phpt +++ b/ext/gmp/tests/gmp_pown.phpt @@ -26,9 +26,6 @@ var_dump(gmp_powm(array(),$e,$m)); var_dump(gmp_powm($n,array(),$m)); var_dump(gmp_powm($n,$e,array())); var_dump(gmp_powm(array(),array(),array())); -var_dump(gmp_powm(array(),array())); -var_dump(gmp_powm(array())); -var_dump(gmp_powm()); $n = gmp_init("-5"); var_dump(gmp_powm(10, $n, 10)); @@ -67,15 +64,6 @@ bool(false) Warning: gmp_powm(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) -Warning: gmp_powm() expects exactly 3 parameters, 2 given in %s on line %d -NULL - -Warning: gmp_powm() expects exactly 3 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_powm() expects exactly 3 parameters, 0 given in %s on line %d -NULL - Warning: gmp_powm(): Second parameter cannot be less than 0 in %s on line %d bool(false) object(GMP)#%d (1) { diff --git a/ext/gmp/tests/gmp_prob_prime.phpt b/ext/gmp/tests/gmp_prob_prime.phpt index 99735bd7c0..2872e01d84 100644 --- a/ext/gmp/tests/gmp_prob_prime.phpt +++ b/ext/gmp/tests/gmp_prob_prime.phpt @@ -28,7 +28,6 @@ var_dump(gmp_prob_prime($n)); $n = gmp_init(0); var_dump(gmp_prob_prime($n)); -var_dump(gmp_prob_prime()); var_dump(gmp_prob_prime(array())); echo "Done\n"; @@ -73,9 +72,6 @@ int(0) int(0) int(0) -Warning: gmp_prob_prime() expects at least 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_prob_prime(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) Done diff --git a/ext/gmp/tests/gmp_random.phpt b/ext/gmp/tests/gmp_random.phpt deleted file mode 100644 index ab2b11b3f7..0000000000 --- a/ext/gmp/tests/gmp_random.phpt +++ /dev/null @@ -1,60 +0,0 @@ ---TEST-- -gmp_random() basic tests ---SKIPIF-- -<?php if (!extension_loaded("gmp")) print "skip"; ?> ---FILE-- -<?php - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(-1))); -var_dump(gmp_strval(gmp_random(0))); -var_dump(gmp_strval(gmp_random(10))); -var_dump(gmp_strval(gmp_random("-10"))); -var_dump(gmp_strval(gmp_random(-10))); - -var_dump(gmp_random(array())); -var_dump(gmp_random(array(),1)); -var_dump(gmp_random("")); -var_dump(gmp_random("test")); - -echo "Done\n"; -?> ---EXPECTF-- -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(1) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d -string(%d) "%d" - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects parameter 1 to be int, array given in %s on line %d -NULL - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects at most 1 parameter, 2 given in %s on line %d -NULL - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d -NULL - -Deprecated: Function gmp_random() is deprecated in %s on line %d - -Warning: gmp_random() expects parameter 1 to be int, string given in %s on line %d -NULL -Done diff --git a/ext/gmp/tests/gmp_random_bits.phpt b/ext/gmp/tests/gmp_random_bits.phpt index b4aa5d7b73..42b90d6fe3 100644 --- a/ext/gmp/tests/gmp_random_bits.phpt +++ b/ext/gmp/tests/gmp_random_bits.phpt @@ -5,7 +5,6 @@ gmp_random_bits() basic tests --FILE-- <?php -var_dump(gmp_random_bits()); var_dump(gmp_random_bits(0)); var_dump(gmp_random_bits(-1)); @@ -34,9 +33,6 @@ while (1) { echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_random_bits() expects exactly 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_random_bits(): The number of bits must be positive in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_random_range.phpt b/ext/gmp/tests/gmp_random_range.phpt index 654ffbefb3..fec8274167 100644 --- a/ext/gmp/tests/gmp_random_range.phpt +++ b/ext/gmp/tests/gmp_random_range.phpt @@ -9,8 +9,6 @@ $minusTen = gmp_init(-10); $plusTen = gmp_init(10); $zero = gmp_init(0); -var_dump(gmp_random_range()); -var_dump(gmp_random_range(10)); var_dump(gmp_random_range(10, -10)); var_dump(gmp_random_range($plusTen, $minusTen)); @@ -64,12 +62,6 @@ while (1) { echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_random_range() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_random_range() expects exactly 2 parameters, 1 given in %s on line %d -NULL - Warning: gmp_random_range(): The minimum value must be less than the maximum value in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_random_seed-32bit.phpt b/ext/gmp/tests/gmp_random_seed-32bit.phpt deleted file mode 100644 index 95d8dd50f9..0000000000 --- a/ext/gmp/tests/gmp_random_seed-32bit.phpt +++ /dev/null @@ -1,232 +0,0 @@ ---TEST-- -gmp_random_seed() basic tests ---SKIPIF-- -<?php if (!extension_loaded("gmp")) print "skip"; ?> -<?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> ---INI-- -error_reporting=E_ALL&~E_DEPRECATED ---FILE-- -<?php - -// zero int -var_dump(gmp_random_seed(0)); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -// zero gmp -var_dump(gmp_random_seed(gmp_init(0))); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -// negative int -var_dump(gmp_random_seed(-100)); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -// negative gmp -var_dump(gmp_random_seed(gmp_init(-100))); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -// positive int -var_dump(gmp_random_seed(100)); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -// positive gmp -var_dump(gmp_random_seed(100)); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -$seed = gmp_init(1); -$seed <<= 512; - -// large negative gmp -var_dump(gmp_random_seed($seed * -1)); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -// large positive gmp -var_dump(gmp_random_seed($seed)); - -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - -var_dump(gmp_strval(gmp_random_bits(10))); -var_dump(gmp_strval(gmp_random_bits(100))); -var_dump(gmp_strval(gmp_random_bits(1000))); - -var_dump(gmp_strval(gmp_random_range(0, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 10000))); -var_dump(gmp_strval(gmp_random_range(-10000, 0))); - - -// standard non conversion error -var_dump(gmp_random_seed('not a number')); - - -echo "Done\n"; -?> ---EXPECTF-- -NULL -string(193) "2000022451473107283132031190545479155678097978829612864726689673263990484954900429188146529905019042225609517482723730948135765344007937183893986134210303199345433818579954244943136664096571499" -string(10) "3792281639" -string(97) "1281406676617847191505318987040099388645126071814252743902229506206669580396236451813261179688680" -string(2) "86" -string(30) "539590049119295715487546581833" -string(301) "1421393257467327495225454368915273750356127352353055226245692071178379257048985726109650766437957017507708821700349355658110489309871463201057688894986035545794429493563972043777521547094922637182497036750765553664196591958728194711096442220858890056073974348364544481270013556644174056049511198143353" -string(4) "8971" -string(4) "7838" -string(5) "-7823" -NULL -string(193) "2000022451473107283132031190545479155678097978829612864726689673263990484954900429188146529905019042225609517482723730948135765344007937183893986134210303199345433818579954244943136664096571499" -string(10) "3792281639" -string(97) "1281406676617847191505318987040099388645126071814252743902229506206669580396236451813261179688680" -string(2) "86" -string(30) "539590049119295715487546581833" -string(301) "1421393257467327495225454368915273750356127352353055226245692071178379257048985726109650766437957017507708821700349355658110489309871463201057688894986035545794429493563972043777521547094922637182497036750765553664196591958728194711096442220858890056073974348364544481270013556644174056049511198143353" -string(4) "8971" -string(4) "7838" -string(5) "-7823" -NULL -string(193) "2481908463276861025880840116973116041137167231715512003123396619946362384184452775649311777755189162364804428739438733886421190841599393284032499618736594054572838636962845446571583771860379424" -string(9) "513032517" -string(97) "1269389652350468424962405917839748437534426606829298977422985976022226588797299164880342257267822" -string(3) "111" -string(31) "1007352579363975542750518386428" -string(301) "5972672173406546932378461222050826195392618168845902231231085819967980051373112173617569638344495916340820360974139193579303652817960325137050189614326029375858951250371622253667077551034119958866481056760107123567590230789917209543206262943739654964107980961862387602012190907147667678648223791029527" -string(4) "2362" -string(5) "-9377" -string(5) "-8435" -NULL -string(193) "2481908463276861025880840116973116041137167231715512003123396619946362384184452775649311777755189162364804428739438733886421190841599393284032499618736594054572838636962845446571583771860379424" -string(9) "513032517" -string(97) "1269389652350468424962405917839748437534426606829298977422985976022226588797299164880342257267822" -string(3) "111" -string(31) "1007352579363975542750518386428" -string(301) "5972672173406546932378461222050826195392618168845902231231085819967980051373112173617569638344495916340820360974139193579303652817960325137050189614326029375858951250371622253667077551034119958866481056760107123567590230789917209543206262943739654964107980961862387602012190907147667678648223791029527" -string(4) "2362" -string(5) "-9377" -string(5) "-8435" -NULL -string(193) "2481908463276861025880840116973116041137167231715512003123396619946362384184452775649311777755189162364804428739438733886421190841599393284032499618736594054572838636962845446571583771860379424" -string(9) "513032517" -string(97) "1269389652350468424962405917839748437534426606829298977422985976022226588797299164880342257267822" -string(3) "111" -string(31) "1007352579363975542750518386428" -string(301) "5972672173406546932378461222050826195392618168845902231231085819967980051373112173617569638344495916340820360974139193579303652817960325137050189614326029375858951250371622253667077551034119958866481056760107123567590230789917209543206262943739654964107980961862387602012190907147667678648223791029527" -string(4) "2362" -string(5) "-9377" -string(5) "-8435" -NULL -string(193) "2481908463276861025880840116973116041137167231715512003123396619946362384184452775649311777755189162364804428739438733886421190841599393284032499618736594054572838636962845446571583771860379424" -string(9) "513032517" -string(97) "1269389652350468424962405917839748437534426606829298977422985976022226588797299164880342257267822" -string(3) "111" -string(31) "1007352579363975542750518386428" -string(301) "5972672173406546932378461222050826195392618168845902231231085819967980051373112173617569638344495916340820360974139193579303652817960325137050189614326029375858951250371622253667077551034119958866481056760107123567590230789917209543206262943739654964107980961862387602012190907147667678648223791029527" -string(4) "2362" -string(5) "-9377" -string(5) "-8435" -NULL -string(193) "4314861641594785951065006537821497084129700255567731661104366342587560122488351847486220156468888511744226746306538524023190734733433083354034308520246964938498767672539252131810891590624763642" -string(10) "3301287097" -string(97) "1532710025135934106005683287301200805525218110207399702226596673360222079570223526337866801028045" -string(3) "317" -string(30) "949682013136255600092941702271" -string(302) "10419061168407861659407303769436775291881708415032871985692089124472434944956010985892897595466043265819000974537553172663152640727594826474137173310039809413311432062725623183603946900548710858191078057179743726366436832870919212340219523613153893742764101120396858424887711932475871305848021245801132" -string(4) "2417" -string(5) "-7975" -string(4) "-378" -NULL -string(193) "4314861641594785951065006537821497084129700255567731661104366342587560122488351847486220156468888511744226746306538524023190734733433083354034308520246964938498767672539252131810891590624763642" -string(10) "3301287097" -string(97) "1532710025135934106005683287301200805525218110207399702226596673360222079570223526337866801028045" -string(3) "317" -string(30) "949682013136255600092941702271" -string(302) "10419061168407861659407303769436775291881708415032871985692089124472434944956010985892897595466043265819000974537553172663152640727594826474137173310039809413311432062725623183603946900548710858191078057179743726366436832870919212340219523613153893742764101120396858424887711932475871305848021245801132" -string(4) "2417" -string(5) "-7975" -string(4) "-378" - -Warning: gmp_random_seed(): Unable to convert variable to GMP - string is not an integer in %s on line %d -bool(false) -Done diff --git a/ext/gmp/tests/gmp_random_seed.phpt b/ext/gmp/tests/gmp_random_seed.phpt index e143a5153e..80f49ee32c 100644 --- a/ext/gmp/tests/gmp_random_seed.phpt +++ b/ext/gmp/tests/gmp_random_seed.phpt @@ -3,18 +3,12 @@ gmp_random_seed() basic tests --SKIPIF-- <?php if (!extension_loaded("gmp")) print "skip"; ?> <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> ---INI-- -error_reporting=E_ALL&~E_DEPRECATED --FILE-- <?php // zero int var_dump(gmp_random_seed(0)); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -27,10 +21,6 @@ var_dump(gmp_strval(gmp_random_range(-10000, 0))); // zero gmp var_dump(gmp_random_seed(gmp_init(0))); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -43,10 +33,6 @@ var_dump(gmp_strval(gmp_random_range(-10000, 0))); // negative int var_dump(gmp_random_seed(-100)); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -59,10 +45,6 @@ var_dump(gmp_strval(gmp_random_range(-10000, 0))); // negative gmp var_dump(gmp_random_seed(gmp_init(-100))); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -75,10 +57,6 @@ var_dump(gmp_strval(gmp_random_range(-10000, 0))); // positive int var_dump(gmp_random_seed(100)); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -91,10 +69,6 @@ var_dump(gmp_strval(gmp_random_range(-10000, 0))); // positive gmp var_dump(gmp_random_seed(100)); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -110,10 +84,6 @@ $seed <<= 512; // large negative gmp var_dump(gmp_random_seed($seed * -1)); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -126,10 +96,6 @@ var_dump(gmp_strval(gmp_random_range(-10000, 0))); // large positive gmp var_dump(gmp_random_seed($seed)); -var_dump(gmp_strval(gmp_random())); -var_dump(gmp_strval(gmp_random(1))); -var_dump(gmp_strval(gmp_random(10))); - var_dump(gmp_strval(gmp_random_bits(10))); var_dump(gmp_strval(gmp_random_bits(100))); var_dump(gmp_strval(gmp_random_bits(1000))); @@ -147,85 +113,61 @@ echo "Done\n"; ?> --EXPECTF-- NULL -string(386) "16100871751340485642888774479422205950971474538471317276388238970713821926852258806210387669237144400278914671533438653274777493140545293541785377162348524402063489947660558889561219968642920852870483050552936324125257259316643328803697665037881088889859735075814746314563786538493931260996669892959501637800179548654075887300734264333417283208357503038004080669367070111848040502362219" -string(18) "255344473360201232" -string(192) "566276705882089203328999735915155615747289398229935944715725865523491463654289449864817867794422824157675456435165973986660058784111212531276312901205233176071526587181942240113004108328736022" -string(3) "766" -string(31) "1251852006013618829761115383588" -string(301) "2904442664575028522451529381233481137998826790384445089758175726247096826023839957531211794198483328480161675791738894500687706952157332727908305084432443942315866545175274665372161864357698401817740956147940095302549920711069038378541222669595494627580205085300332122174778540693048337420608925104417" -string(4) "5969" -string(5) "-4126" -string(4) "-926" +string(3) "107" +string(30) "576055025228722307492589900056" +string(301) "5075491613651149525976453192895895253653438900772590630831858908690082668789318258254821002217677675804439098856210618572534955562143303188483908287009522532300439665975877709754914215718998849272363858786685187951932478210775857465448084868199807983919191214972626993925394176279001074206804955195464" +string(4) "4098" +string(3) "866" +string(5) "-4602" NULL -string(386) "16100871751340485642888774479422205950971474538471317276388238970713821926852258806210387669237144400278914671533438653274777493140545293541785377162348524402063489947660558889561219968642920852870483050552936324125257259316643328803697665037881088889859735075814746314563786538493931260996669892959501637800179548654075887300734264333417283208357503038004080669367070111848040502362219" -string(18) "255344473360201232" -string(192) "566276705882089203328999735915155615747289398229935944715725865523491463654289449864817867794422824157675456435165973986660058784111212531276312901205233176071526587181942240113004108328736022" -string(3) "766" -string(31) "1251852006013618829761115383588" -string(301) "2904442664575028522451529381233481137998826790384445089758175726247096826023839957531211794198483328480161675791738894500687706952157332727908305084432443942315866545175274665372161864357698401817740956147940095302549920711069038378541222669595494627580205085300332122174778540693048337420608925104417" -string(4) "5969" -string(5) "-4126" -string(4) "-926" +string(3) "107" +string(30) "576055025228722307492589900056" +string(301) "5075491613651149525976453192895895253653438900772590630831858908690082668789318258254821002217677675804439098856210618572534955562143303188483908287009522532300439665975877709754914215718998849272363858786685187951932478210775857465448084868199807983919191214972626993925394176279001074206804955195464" +string(4) "4098" +string(3) "866" +string(5) "-4602" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "13477111096113160882601567427091178332669645276785709413953468738199940626922635042144840457533224221336117027441609364710893482124071124759231943384805378201041406842697962243732316555316214869988749798708139879922380266366387589101775891621221881149417841139463207495993669582399783202126977651864760442797681787747348653884279195479310922110107643437514016795836672871442926389274400" -string(20) "15370156633245019617" -string(192) "294354325919119835375781661354719128667828860233586416953977190644006896604022494655398295674227944872858213051595447565156112646032890737200590095517623075051828676500990477704073251304424133" -string(3) "683" -string(31) "1105092118036828878542238774672" -string(301) "2700084798786584694260166508009114488318099110808331607090845844712329387915039325877090587052399841255219556028410036280510827424748532204766771994624650610348058361519239518625728955462297681525123214377383395734875500143425080808436274385326255154393544373636015993206705180032889399161843788895374" -string(4) "7268" -string(5) "-3518" -string(5) "-8432" +string(3) "800" +string(30) "136797365759249926716355081555" +string(300) "983682312243221532860194306859606025979259367996304596374614332718375645173854152266611727577102182844028492473112400528817154210713755887896949560718745264129216953815968005630126359941634684721501777057142617647654380585317016323758806063124938232519551123440573348326061244006512869165793958775168" +string(4) "1029" +string(4) "7093" +string(5) "-9074" NULL -string(386) "17517289823903393220742578279919954815229524740463730368402128237511862318453381595675765692750750649609755422480004471234960388086555321894591036872550129477305413674775698107868844953599169316550102271816620108199930104365341610775602960735862041722613145476720452800951958891882288668416542937408952006310656170195090436314902430700708511047189929836145291647101130135292078875631354" -string(19) "1662391866670215057" -string(193) "1951928859951518261564127834731454911658112769477733872890285741065126442731035642243573666695893929882207432512593006044657806021743917753379619843420559355572830613932424235592411658293328273" -string(3) "888" -string(30) "136524289584478309125073026188" -string(301) "4487372666528061674404740793683112894444118579769413902123304803304884162086348577960502430419080687314731489440882833272125181594897832730214825704339272207090970657364333461383490282984012738008555512699878911293400686609929745464733074891420787002129849587668122219953473716759349853748437799165176" -string(4) "8559" -string(4) "9426" -string(5) "-2932" +string(3) "762" +string(30) "822340340897453415684831711085" +string(301) "7240560133683902061389868703829443708354917824328579773726122219756981024103097560162756171513655189995985599958252688592185764428631571614485572869738344560301294144844739876478557439580966605216861285841689262517286639329902832431755450003123084728943981078635297917573398492558065003906539489023830" +string(4) "9636" +string(5) "-9848" +string(5) "-9648" NULL -string(386) "17517289823903393220742578279919954815229524740463730368402128237511862318453381595675765692750750649609755422480004471234960388086555321894591036872550129477305413674775698107868844953599169316550102271816620108199930104365341610775602960735862041722613145476720452800951958891882288668416542937408952006310656170195090436314902430700708511047189929836145291647101130135292078875631354" -string(19) "1662391866670215057" -string(193) "1951928859951518261564127834731454911658112769477733872890285741065126442731035642243573666695893929882207432512593006044657806021743917753379619843420559355572830613932424235592411658293328273" -string(3) "888" -string(30) "136524289584478309125073026188" -string(301) "4487372666528061674404740793683112894444118579769413902123304803304884162086348577960502430419080687314731489440882833272125181594897832730214825704339272207090970657364333461383490282984012738008555512699878911293400686609929745464733074891420787002129849587668122219953473716759349853748437799165176" -string(4) "8559" -string(4) "9426" -string(5) "-2932" +string(3) "762" +string(30) "822340340897453415684831711085" +string(301) "7240560133683902061389868703829443708354917824328579773726122219756981024103097560162756171513655189995985599958252688592185764428631571614485572869738344560301294144844739876478557439580966605216861285841689262517286639329902832431755450003123084728943981078635297917573398492558065003906539489023830" +string(4) "9636" +string(5) "-9848" +string(5) "-9648" Warning: gmp_random_seed(): Unable to convert variable to GMP - string is not an integer in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_remroot.phpt b/ext/gmp/tests/gmp_remroot.phpt index acd8f84925..1316d7651c 100644 --- a/ext/gmp/tests/gmp_remroot.phpt +++ b/ext/gmp/tests/gmp_remroot.phpt @@ -5,8 +5,6 @@ gmp_rootrem() basic tests --FILE-- <?php -var_dump(gmp_rootrem()); - var_dump(gmp_rootrem(1000, 3)); var_dump(gmp_rootrem(100, 3)); var_dump(gmp_rootrem(-100, 3)); @@ -21,8 +19,6 @@ var_dump(gmp_rootrem(100, -3)); ?> --EXPECTF-- -Warning: gmp_rootrem() expects exactly 2 parameters, 0 given in %s on line %d -NULL array(2) { [0]=> object(GMP)#%d (1) { diff --git a/ext/gmp/tests/gmp_root.phpt b/ext/gmp/tests/gmp_root.phpt index 654e2ffeb6..47c1fcc608 100644 --- a/ext/gmp/tests/gmp_root.phpt +++ b/ext/gmp/tests/gmp_root.phpt @@ -5,8 +5,6 @@ gmp_root() basic tests --FILE-- <?php -var_dump(gmp_root()); - var_dump(gmp_root(1000, 3)); var_dump(gmp_root(100, 3)); var_dump(gmp_root(-100, 3)); @@ -21,8 +19,6 @@ var_dump(gmp_root(100, -3)); ?> --EXPECTF-- -Warning: gmp_root() expects exactly 2 parameters, 0 given in %s on line %d -NULL object(GMP)#%d (1) { ["num"]=> string(2) "10" diff --git a/ext/gmp/tests/gmp_scan0.phpt b/ext/gmp/tests/gmp_scan0.phpt index fb70cf8b25..c06f91f7dd 100644 --- a/ext/gmp/tests/gmp_scan0.phpt +++ b/ext/gmp/tests/gmp_scan0.phpt @@ -15,8 +15,6 @@ $n = gmp_init("24234527465274"); var_dump(gmp_scan0($n, 10)); var_dump(gmp_scan0(array(), 200)); -var_dump(gmp_scan0(array())); -var_dump(gmp_scan0()); echo "Done\n"; ?> @@ -31,10 +29,4 @@ int(13) Warning: gmp_scan0(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_scan0() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_scan0() expects exactly 2 parameters, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_scan1.phpt b/ext/gmp/tests/gmp_scan1.phpt index a89a9195b0..43a2fdfa1b 100644 --- a/ext/gmp/tests/gmp_scan1.phpt +++ b/ext/gmp/tests/gmp_scan1.phpt @@ -15,8 +15,6 @@ $n = gmp_init("24234527465274"); var_dump(gmp_scan1($n, 10)); var_dump(gmp_scan1(array(), 200)); -var_dump(gmp_scan1(array())); -var_dump(gmp_scan1()); echo "Done\n"; ?> @@ -31,10 +29,4 @@ int(10) Warning: gmp_scan1(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_scan1() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: gmp_scan1() expects exactly 2 parameters, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_setbit.phpt b/ext/gmp/tests/gmp_setbit.phpt index 2eac23db0e..15270eaf7b 100644 --- a/ext/gmp/tests/gmp_setbit.phpt +++ b/ext/gmp/tests/gmp_setbit.phpt @@ -32,12 +32,17 @@ gmp_setbit($n, 3); var_dump(gmp_strval($n)); $b = ""; -gmp_setbit($b, 23); -gmp_setbit($b); -gmp_setbit($b, 23,1,1); -gmp_setbit($b,array()); +try { + gmp_setbit($b, 23); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} $a = array(); -gmp_setbit($a,array()); +try { + gmp_setbit($a, array()); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} echo "Done\n"; ?> @@ -52,14 +57,6 @@ string(1) "7" string(12) "100008388608" string(12) "100000000000" string(12) "100000000008" - -Warning: gmp_setbit() expects parameter 1 to be GMP, string given in %s on line %d - -Warning: gmp_setbit() expects at least 2 parameters, 1 given in %s on line %d - -Warning: gmp_setbit() expects at most 3 parameters, 4 given in %s on line %d - -Warning: gmp_setbit() expects parameter 1 to be GMP, string given in %s on line %d - -Warning: gmp_setbit() expects parameter 1 to be GMP, array given in %s on line %d +gmp_setbit() expects parameter 1 to be GMP, string given +gmp_setbit() expects parameter 1 to be GMP, array given Done diff --git a/ext/gmp/tests/gmp_sign.phpt b/ext/gmp/tests/gmp_sign.phpt index 7ac03013d4..ac01845395 100644 --- a/ext/gmp/tests/gmp_sign.phpt +++ b/ext/gmp/tests/gmp_sign.phpt @@ -13,9 +13,7 @@ var_dump(gmp_sign("-34535345345")); var_dump(gmp_sign("+34534573457345")); $n = gmp_init("098909878976786545"); var_dump(gmp_sign($n)); -var_dump(gmp_sign($n, $n)); var_dump(gmp_sign(array())); -var_dump(gmp_sign()); echo "Done\n"; ?> @@ -32,12 +30,6 @@ bool(false) Warning: gmp_init(): Unable to convert variable to GMP - string is not an integer in %s on line %d int(0) -Warning: gmp_sign() expects exactly 1 parameter, 2 given in %s on line %d -NULL - Warning: gmp_sign(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_sign() expects exactly 1 parameter, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_sqrt.phpt b/ext/gmp/tests/gmp_sqrt.phpt index e824de3706..03c460b79a 100644 --- a/ext/gmp/tests/gmp_sqrt.phpt +++ b/ext/gmp/tests/gmp_sqrt.phpt @@ -18,8 +18,6 @@ var_dump(gmp_strval(gmp_sqrt($n))); $n = gmp_init(777); var_dump(gmp_strval(gmp_sqrt($n))); -var_dump(gmp_sqrt($n, 1)); -var_dump(gmp_sqrt()); var_dump(gmp_sqrt(array())); echo "Done\n"; @@ -39,12 +37,6 @@ Warning: gmp_sqrt(): Number has to be greater than or equal to 0 in %s on line % string(1) "0" string(2) "27" -Warning: gmp_sqrt() expects exactly 1 parameter, 2 given in %s on line %d -NULL - -Warning: gmp_sqrt() expects exactly 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_sqrt(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) Done diff --git a/ext/gmp/tests/gmp_sqrtrem.phpt b/ext/gmp/tests/gmp_sqrtrem.phpt index 595a1dc45a..c19969158e 100644 --- a/ext/gmp/tests/gmp_sqrtrem.phpt +++ b/ext/gmp/tests/gmp_sqrtrem.phpt @@ -51,7 +51,6 @@ var_dump(gmp_strval($r[0])); var_dump(gmp_strval($r[1])); var_dump(gmp_sqrtrem(array())); -var_dump(gmp_sqrtrem()); echo "Done\n"; ?> @@ -82,7 +81,4 @@ string(1) "1" Warning: gmp_sqrtrem(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) - -Warning: gmp_sqrtrem() expects exactly 1 parameter, 0 given in %s on line %d -NULL Done diff --git a/ext/gmp/tests/gmp_strval.phpt b/ext/gmp/tests/gmp_strval.phpt index cfa7335667..b349d31699 100644 --- a/ext/gmp/tests/gmp_strval.phpt +++ b/ext/gmp/tests/gmp_strval.phpt @@ -5,11 +5,8 @@ gmp_strval() tests --FILE-- <?php -var_dump(gmp_strval()); var_dump(gmp_strval("")); -var_dump(gmp_strval("", "")); var_dump(gmp_strval("", -1)); -var_dump(gmp_strval(-1, "")); $fp = fopen(__FILE__, "r"); var_dump(gmp_strval($fp)); @@ -26,29 +23,18 @@ var_dump(gmp_strval($g, -1)); var_dump(gmp_strval($g, 100000)); var_dump(gmp_strval($g, 10)); -var_dump(gmp_strval(array(1,2), array(1,2))); -var_dump(gmp_strval(new stdclass, new stdclass)); var_dump(gmp_strval(array(1,2))); var_dump(gmp_strval(new stdclass)); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_strval() expects at least 1 parameter, 0 given in %s on line %d -NULL - Warning: gmp_strval(): Unable to convert variable to GMP - string is not an integer in %s on line %d bool(false) -Warning: gmp_strval() expects parameter 2 to be int, string given in %s on line %d -NULL - Warning: gmp_strval(): Bad base for conversion: -1 (should be between 2 and %d or -2 and -%d) in %s on line %d bool(false) -Warning: gmp_strval() expects parameter 2 to be int, string given in %s on line %d -NULL - Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) string(7) "9765456" @@ -68,12 +54,6 @@ Warning: gmp_strval(): Bad base for conversion: 100000 (should be between 2 and bool(false) string(8) "-3373333" -Warning: gmp_strval() expects parameter 2 to be int, array given in %s on line %d -NULL - -Warning: gmp_strval() expects parameter 2 to be int, object given in %s on line %d -NULL - Warning: gmp_strval(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) diff --git a/ext/gmp/tests/gmp_sub.phpt b/ext/gmp/tests/gmp_sub.phpt index fabc0c0ebb..b8dce49774 100644 --- a/ext/gmp/tests/gmp_sub.phpt +++ b/ext/gmp/tests/gmp_sub.phpt @@ -5,10 +5,7 @@ gmp_sub() tests --FILE-- <?php -var_dump(gmp_sub()); -var_dump(gmp_sub("")); var_dump(gmp_sub("", "")); -var_dump(gmp_sub("", "", "")); var_dump(gmp_sub(array(), array())); var_dump($g = gmp_sub(10000, 10001)); @@ -23,18 +20,9 @@ var_dump(gmp_strval($g)); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_sub() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: gmp_sub() expects exactly 2 parameters, 1 given in %s on line %d -NULL - Warning: gmp_sub(): Unable to convert variable to GMP - string is not an integer in %s on line %d bool(false) -Warning: gmp_sub() expects exactly 2 parameters, 3 given in %s on line %d -NULL - Warning: gmp_sub(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) object(GMP)#%d (1) { diff --git a/ext/gmp/tests/gmp_testbit.phpt b/ext/gmp/tests/gmp_testbit.phpt index bdabe3d841..f18af5d44d 100644 --- a/ext/gmp/tests/gmp_testbit.phpt +++ b/ext/gmp/tests/gmp_testbit.phpt @@ -5,8 +5,6 @@ gmp_testbit() basic tests --FILE-- <?php -var_dump(gmp_testbit()); - $n = gmp_init(0); var_dump(gmp_testbit($n, -10)); var_dump(gmp_testbit($n, 0)); @@ -40,9 +38,6 @@ var_dump(gmp_strval($n)); echo "Done\n"; ?> --EXPECTF-- -Warning: gmp_testbit() expects exactly 2 parameters, 0 given in %s on line %d -NULL - Warning: gmp_testbit(): Index must be greater than or equal to zero in %s on line %d bool(false) bool(false) diff --git a/ext/gmp/tests/gmp_xor.phpt b/ext/gmp/tests/gmp_xor.phpt index 9bf31f02f4..cc508907aa 100644 --- a/ext/gmp/tests/gmp_xor.phpt +++ b/ext/gmp/tests/gmp_xor.phpt @@ -17,8 +17,6 @@ var_dump(gmp_strval(gmp_xor($n, "34332"))); $n1 = gmp_init("987657878765436543456"); var_dump(gmp_strval(gmp_xor($n, $n1))); -var_dump(gmp_xor($n, $n1, 1)); -var_dump(gmp_xor(1)); var_dump(gmp_xor(array(), 1)); var_dump(gmp_xor(1, array())); var_dump(gmp_xor(array(), array())); @@ -37,12 +35,6 @@ string(1) "0" string(15) "987657876574716" string(21) "987658017016065701376" -Warning: gmp_xor() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: gmp_xor() expects exactly 2 parameters, 1 given in %s on line %d -NULL - Warning: gmp_xor(): Unable to convert variable to GMP - wrong type in %s on line %d bool(false) |