diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-11-30 16:45:48 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-11 21:46:13 +0100 |
| commit | b10416a652d26577a22fe0b183b2258b20c8bb86 (patch) | |
| tree | 3b79102286b2307575f487bf97d572ffc292631d /ext/standard/tests/math | |
| parent | f06895488a5fabd27ac4c2e66a9d311f14d8594e (diff) | |
| download | php-git-b10416a652d26577a22fe0b183b2258b20c8bb86.tar.gz | |
Deprecate passing null to non-nullable arg of internal function
This deprecates passing null to non-nullable scale arguments of
internal functions, with the eventual goal of making the behavior
consistent with userland functions, where null is never accepted
for non-nullable arguments.
This change is expected to cause quite a lot of fallout. In most
cases, calling code should be adjusted to avoid passing null. In
some cases, PHP should be adjusted to make some function arguments
nullable. I have already fixed a number of functions before landing
this, but feel free to file a bug if you encounter a function that
doesn't accept null, but probably should. (The rule of thumb for
this to be applicable is that the function must have special behavior
for 0 or "", which is distinct from the natural behavior of the
parameter.)
RFC: https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg
Closes GH-6475.
Diffstat (limited to 'ext/standard/tests/math')
61 files changed, 126 insertions, 585 deletions
diff --git a/ext/standard/tests/math/abs_basic.phpt b/ext/standard/tests/math/abs_basic.phpt index 65120efef6..2b4957b996 100644 --- a/ext/standard/tests/math/abs_basic.phpt +++ b/ext/standard/tests/math/abs_basic.phpt @@ -26,7 +26,7 @@ for ($i = 0; $i < count($values); $i++) { var_dump($res); } ?> ---EXPECT-- +--EXPECTF-- *** Testing abs() : basic functionality *** int(23) int(23) @@ -39,6 +39,8 @@ int(23) float(23.45) float(23.45) float(23.45) + +Deprecated: abs(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d int(0) int(1) int(0) diff --git a/ext/standard/tests/math/abs_variation.phpt b/ext/standard/tests/math/abs_variation.phpt index 6b7a184cbd..d7f878bc01 100644 --- a/ext/standard/tests/math/abs_variation.phpt +++ b/ext/standard/tests/math/abs_variation.phpt @@ -78,13 +78,17 @@ foreach($inputs as $input) { fclose($fp); ?> ---EXPECT-- +--EXPECTF-- *** Testing abs() : usage variations *** -- Iteration 1 -- + +Deprecated: abs(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d int(0) -- Iteration 2 -- + +Deprecated: abs(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d int(0) -- Iteration 3 -- @@ -121,9 +125,13 @@ abs(): Argument #1 ($num) must be of type int|float, string given abs(): Argument #1 ($num) must be of type int|float, classA given -- Iteration 14 -- + +Deprecated: abs(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d int(0) -- Iteration 15 -- + +Deprecated: abs(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d int(0) -- Iteration 16 -- diff --git a/ext/standard/tests/math/acos_variation.phpt b/ext/standard/tests/math/acos_variation.phpt index 163487d99f..1fac4ccc24 100644 --- a/ext/standard/tests/math/acos_variation.phpt +++ b/ext/standard/tests/math/acos_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(NAN) float(NAN) float(NAN) float(NAN) -float(1.5707963267948966) float(0) float(1.5707963267948966) diff --git a/ext/standard/tests/math/acosh_variation.phpt b/ext/standard/tests/math/acosh_variation.phpt index 904316a998..9335961e63 100644 --- a/ext/standard/tests/math/acosh_variation.phpt +++ b/ext/standard/tests/math/acosh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(3.8281684713331012) float(3.8475627390640357) float(3.8475627390640357) float(7.600902209541989) -float(NAN) float(0) float(NAN) diff --git a/ext/standard/tests/math/asin_variation.phpt b/ext/standard/tests/math/asin_variation.phpt index 323701c51a..d028689439 100644 --- a/ext/standard/tests/math/asin_variation.phpt +++ b/ext/standard/tests/math/asin_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(NAN) float(NAN) float(NAN) float(NAN) -float(0) float(1.5707963267948966) float(0) diff --git a/ext/standard/tests/math/asinh_variation.phpt b/ext/standard/tests/math/asinh_variation.phpt index 4958468064..e7b9fd9c54 100644 --- a/ext/standard/tests/math/asinh_variation.phpt +++ b/ext/standard/tests/math/asinh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(3.829113652) float(3.848471992) float(3.848471992) float(7.60090271) -float(0) float(0.881373587) float(0) diff --git a/ext/standard/tests/math/atan2_basic.phpt b/ext/standard/tests/math/atan2_basic.phpt index 1763795cfa..1c89cfa1c2 100644 --- a/ext/standard/tests/math/atan2_basic.phpt +++ b/ext/standard/tests/math/atan2_basic.phpt @@ -13,7 +13,6 @@ $valuesy = array(23, "23", "23.45", "2.345e1", - null, true, false); @@ -26,7 +25,6 @@ $valuesx = array(23, "23", "23.45", "2.345e1", - null, true, false); @@ -48,7 +46,6 @@ Y:23 X:23 float(0.78539816339745) Y:23 X:23 float(0.78539816339745) Y:23 X:23.45 float(0.77571063007847) Y:23 X:2.345e1 float(0.77571063007847) -Y:23 X: float(1.5707963267949) Y:23 X:1 float(1.5273454314034) Y:23 X: float(1.5707963267949) Y:-23 X:23 float(-0.78539816339745) @@ -60,7 +57,6 @@ Y:-23 X:23 float(-0.78539816339745) Y:-23 X:23 float(-0.78539816339745) Y:-23 X:23.45 float(-0.77571063007847) Y:-23 X:2.345e1 float(-0.77571063007847) -Y:-23 X: float(-1.5707963267949) Y:-23 X:1 float(-1.5273454314034) Y:-23 X: float(-1.5707963267949) Y:23.45 X:23 float(0.79508569671643) @@ -72,7 +68,6 @@ Y:23.45 X:23 float(0.79508569671643) Y:23.45 X:23 float(0.79508569671643) Y:23.45 X:23.45 float(0.78539816339745) Y:23.45 X:2.345e1 float(0.78539816339745) -Y:23.45 X: float(1.5707963267949) Y:23.45 X:1 float(1.5281782247706) Y:23.45 X: float(1.5707963267949) Y:-23.45 X:23 float(-0.79508569671643) @@ -84,7 +79,6 @@ Y:-23.45 X:23 float(-0.79508569671643) Y:-23.45 X:23 float(-0.79508569671643) Y:-23.45 X:23.45 float(-0.78539816339745) Y:-23.45 X:2.345e1 float(-0.78539816339745) -Y:-23.45 X: float(-1.5707963267949) Y:-23.45 X:1 float(-1.5281782247706) Y:-23.45 X: float(-1.5707963267949) Y:23 X:23 float(0.78539816339745) @@ -96,7 +90,6 @@ Y:23 X:23 float(0.78539816339745) Y:23 X:23 float(0.78539816339745) Y:23 X:23.45 float(0.77571063007847) Y:23 X:2.345e1 float(0.77571063007847) -Y:23 X: float(1.5707963267949) Y:23 X:1 float(1.5273454314034) Y:23 X: float(1.5707963267949) Y:23 X:23 float(0.78539816339745) @@ -108,7 +101,6 @@ Y:23 X:23 float(0.78539816339745) Y:23 X:23 float(0.78539816339745) Y:23 X:23.45 float(0.77571063007847) Y:23 X:2.345e1 float(0.77571063007847) -Y:23 X: float(1.5707963267949) Y:23 X:1 float(1.5273454314034) Y:23 X: float(1.5707963267949) Y:23 X:23 float(0.78539816339745) @@ -120,7 +112,6 @@ Y:23 X:23 float(0.78539816339745) Y:23 X:23 float(0.78539816339745) Y:23 X:23.45 float(0.77571063007847) Y:23 X:2.345e1 float(0.77571063007847) -Y:23 X: float(1.5707963267949) Y:23 X:1 float(1.5273454314034) Y:23 X: float(1.5707963267949) Y:23.45 X:23 float(0.79508569671643) @@ -132,7 +123,6 @@ Y:23.45 X:23 float(0.79508569671643) Y:23.45 X:23 float(0.79508569671643) Y:23.45 X:23.45 float(0.78539816339745) Y:23.45 X:2.345e1 float(0.78539816339745) -Y:23.45 X: float(1.5707963267949) Y:23.45 X:1 float(1.5281782247706) Y:23.45 X: float(1.5707963267949) Y:2.345e1 X:23 float(0.79508569671643) @@ -144,21 +134,8 @@ Y:2.345e1 X:23 float(0.79508569671643) Y:2.345e1 X:23 float(0.79508569671643) Y:2.345e1 X:23.45 float(0.78539816339745) Y:2.345e1 X:2.345e1 float(0.78539816339745) -Y:2.345e1 X: float(1.5707963267949) Y:2.345e1 X:1 float(1.5281782247706) Y:2.345e1 X: float(1.5707963267949) -Y: X:23 float(0) -Y: X:-23 float(3.1415926535898) -Y: X:23.45 float(0) -Y: X:-23.45 float(3.1415926535898) -Y: X:23 float(0) -Y: X:23 float(0) -Y: X:23 float(0) -Y: X:23.45 float(0) -Y: X:2.345e1 float(0) -Y: X: float(0) -Y: X:1 float(0) -Y: X: float(0) Y:1 X:23 float(0.043450895391531) Y:1 X:-23 float(3.0981417581983) Y:1 X:23.45 float(0.042618102024328) @@ -168,7 +145,6 @@ Y:1 X:23 float(0.043450895391531) Y:1 X:23 float(0.043450895391531) Y:1 X:23.45 float(0.042618102024328) Y:1 X:2.345e1 float(0.042618102024328) -Y:1 X: float(1.5707963267949) Y:1 X:1 float(0.78539816339745) Y:1 X: float(1.5707963267949) Y: X:23 float(0) @@ -180,6 +156,5 @@ Y: X:23 float(0) Y: X:23 float(0) Y: X:23.45 float(0) Y: X:2.345e1 float(0) -Y: X: float(0) Y: X:1 float(0) Y: X: float(0) diff --git a/ext/standard/tests/math/atan_variation.phpt b/ext/standard/tests/math/atan_variation.phpt index 88593c84de..abd3831ddd 100644 --- a/ext/standard/tests/math/atan_variation.phpt +++ b/ext/standard/tests/math/atan_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(1.5273454314033659) float(1.528178224770569) float(1.528178224770569) float(1.5697963271282298) -float(0) float(0.7853981633974483) float(0) diff --git a/ext/standard/tests/math/atanh_variation.phpt b/ext/standard/tests/math/atanh_variation.phpt index fa71e206c8..f740c1ccc0 100644 --- a/ext/standard/tests/math/atanh_variation.phpt +++ b/ext/standard/tests/math/atanh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(NAN) float(NAN) float(NAN) float(NAN) -float(0) float(INF) float(0) diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt index 8d8e0ff3a2..fd06465ab5 100644 --- a/ext/standard/tests/math/base_convert_variation1.phpt +++ b/ext/standard/tests/math/base_convert_variation1.phpt @@ -4,10 +4,6 @@ Test base_convert() function : usage variations - different data types as $numbe <?php echo "*** Testing base_convert() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); - // heredoc string $heredoc = <<<EOT abc @@ -32,10 +28,6 @@ $inputs = array( 1.234567E-2, .5, - // null data -/*11*/ NULL, - null, - // boolean data /*13*/ true, false, @@ -52,12 +44,6 @@ $inputs = array( 'abcxyz', $heredoc, - // undefined data -/*23*/ @$undefined_var, - - // unset data -/*24*/ @$unset_var, - // resource variable /*25*/ $fp ); @@ -121,7 +107,7 @@ Deprecated: Invalid characters passed for attempted conversion, these have been string(1) "5" -- Iteration 11 -- -string(1) "0" +string(1) "1" -- Iteration 12 -- string(1) "0" @@ -133,40 +119,28 @@ string(1) "1" string(1) "0" -- Iteration 15 -- -string(1) "1" +string(1) "0" -- Iteration 16 -- string(1) "0" -- Iteration 17 -- -string(1) "0" - --- Iteration 18 -- -string(1) "0" - --- Iteration 19 -- base_convert(): Argument #1 ($num) must be of type string, array given --- Iteration 20 -- +-- Iteration 18 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d string(1) "0" --- Iteration 21 -- +-- Iteration 19 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d string(1) "0" --- Iteration 22 -- +-- Iteration 20 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d string(1) "0" --- Iteration 23 -- -string(1) "0" - --- Iteration 24 -- -string(1) "0" - --- Iteration 25 -- +-- Iteration 21 -- base_convert(): Argument #1 ($num) must be of type string, resource given diff --git a/ext/standard/tests/math/bindec_basic.phpt b/ext/standard/tests/math/bindec_basic.phpt index 03eec8ee30..7640171fe6 100644 --- a/ext/standard/tests/math/bindec_basic.phpt +++ b/ext/standard/tests/math/bindec_basic.phpt @@ -26,7 +26,7 @@ $values = array(111000111, 011237, true, false, - null); + ); for ($i = 0; $i < count($values); $i++) { $res = bindec($values[$i]); @@ -74,4 +74,3 @@ Deprecated: Invalid characters passed for attempted conversion, these have been int(0) int(1) int(0) -int(0) diff --git a/ext/standard/tests/math/bindec_basic_64bit.phpt b/ext/standard/tests/math/bindec_basic_64bit.phpt index b8f46b6748..8fece221c0 100644 --- a/ext/standard/tests/math/bindec_basic_64bit.phpt +++ b/ext/standard/tests/math/bindec_basic_64bit.phpt @@ -26,7 +26,7 @@ $values = array(111000111, 011237, true, false, - null); + ); for ($i = 0; $i < count($values); $i++) { $res = bindec($values[$i]); @@ -74,4 +74,3 @@ Deprecated: Invalid characters passed for attempted conversion, these have been int(0) int(1) int(0) -int(0) diff --git a/ext/standard/tests/math/bindec_variation1.phpt b/ext/standard/tests/math/bindec_variation1.phpt index 5c6b2e1b1e..420ceeed7a 100644 --- a/ext/standard/tests/math/bindec_variation1.phpt +++ b/ext/standard/tests/math/bindec_variation1.phpt @@ -7,9 +7,6 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php echo "*** Testing bindec() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -34,10 +31,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*10*/ NULL, - null, - // boolean data /*12*/ true, false, @@ -54,12 +47,6 @@ $inputs = array( 'abcxyz', $heredoc, - // undefined data -/*22*/ @$undefined_var, - - // unset data -/*23*/ @$unset_var, - // resource variable /*24*/ $fp ); @@ -122,7 +109,7 @@ Deprecated: Invalid characters passed for attempted conversion, these have been int(0) -- Iteration 10 -- -int(0) +int(1) -- Iteration 11 -- int(0) @@ -134,40 +121,28 @@ int(1) int(0) -- Iteration 14 -- -int(1) +int(0) -- Iteration 15 -- int(0) -- Iteration 16 -- -int(0) - --- Iteration 17 -- -int(0) - --- Iteration 18 -- bindec(): Argument #1 ($binary_string) must be of type string, array given --- Iteration 19 -- +-- Iteration 17 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 20 -- +-- Iteration 18 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 21 -- +-- Iteration 19 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 22 -- -int(0) - --- Iteration 23 -- -int(0) - --- Iteration 24 -- +-- Iteration 20 -- bindec(): Argument #1 ($binary_string) must be of type string, resource given diff --git a/ext/standard/tests/math/bindec_variation1_64bit.phpt b/ext/standard/tests/math/bindec_variation1_64bit.phpt index e83edbe59c..56bbbd3564 100644 --- a/ext/standard/tests/math/bindec_variation1_64bit.phpt +++ b/ext/standard/tests/math/bindec_variation1_64bit.phpt @@ -7,9 +7,6 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php echo "*** Testing bindec() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -34,10 +31,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*10*/ NULL, - null, - // boolean data /*12*/ true, false, @@ -54,12 +47,6 @@ $inputs = array( 'abcxyz', $heredoc, - // undefined data -/*22*/ @$undefined_var, - - // unset data -/*23*/ @$unset_var, - // resource variable /*24*/ $fp ); @@ -122,7 +109,7 @@ Deprecated: Invalid characters passed for attempted conversion, these have been int(0) -- Iteration 10 -- -int(0) +int(1) -- Iteration 11 -- int(0) @@ -134,40 +121,28 @@ int(1) int(0) -- Iteration 14 -- -int(1) +int(0) -- Iteration 15 -- int(0) -- Iteration 16 -- -int(0) - --- Iteration 17 -- -int(0) - --- Iteration 18 -- bindec(): Argument #1 ($binary_string) must be of type string, array given --- Iteration 19 -- +-- Iteration 17 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 20 -- +-- Iteration 18 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 21 -- +-- Iteration 19 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 22 -- -int(0) - --- Iteration 23 -- -int(0) - --- Iteration 24 -- +-- Iteration 20 -- bindec(): Argument #1 ($binary_string) must be of type string, resource given diff --git a/ext/standard/tests/math/ceil_basic.phpt b/ext/standard/tests/math/ceil_basic.phpt index a8b3ede2a2..7bdc87d16e 100644 --- a/ext/standard/tests/math/ceil_basic.phpt +++ b/ext/standard/tests/math/ceil_basic.phpt @@ -33,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> ---EXPECT-- +--EXPECTF-- *** Testing ceil() : basic functionality *** float(0) float(0) @@ -54,4 +54,6 @@ float(-3950) float(39) float(1) float(0) + +Deprecated: ceil(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) diff --git a/ext/standard/tests/math/ceil_variation1.phpt b/ext/standard/tests/math/ceil_variation1.phpt index ce61442f65..7751946ea9 100644 --- a/ext/standard/tests/math/ceil_variation1.phpt +++ b/ext/standard/tests/math/ceil_variation1.phpt @@ -71,13 +71,17 @@ foreach($inputs as $input) { }; fclose($fp); ?> ---EXPECT-- +--EXPECTF-- *** Testing ceil() : usage variations *** -- Iteration 1 -- + +Deprecated: ceil(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 2 -- + +Deprecated: ceil(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 3 -- @@ -114,9 +118,13 @@ ceil(): Argument #1 ($num) must be of type int|float, string given ceil(): Argument #1 ($num) must be of type int|float, classA given -- Iteration 14 -- + +Deprecated: ceil(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 15 -- + +Deprecated: ceil(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 16 -- diff --git a/ext/standard/tests/math/cos_variation.phpt b/ext/standard/tests/math/cos_variation.phpt index 23af5e873b..19d72f60a7 100644 --- a/ext/standard/tests/math/cos_variation.phpt +++ b/ext/standard/tests/math/cos_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(-0.5328330203) float(-0.1117112391) float(-0.1117112391) float(0.5623790763) -float(1) float(0.5403023059) float(1) diff --git a/ext/standard/tests/math/cosh_variation.phpt b/ext/standard/tests/math/cosh_variation.phpt index 1a0a6b69e7..475c19fd50 100644 --- a/ext/standard/tests/math/cosh_variation.phpt +++ b/ext/standard/tests/math/cosh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(4872401723) float(7641446995) float(7641446995) float(INF) -float(1) float(1.543080635) float(1) diff --git a/ext/standard/tests/math/decbin_basic.phpt b/ext/standard/tests/math/decbin_basic.phpt index 54b771ca26..ff1d5896f6 100644 --- a/ext/standard/tests/math/decbin_basic.phpt +++ b/ext/standard/tests/math/decbin_basic.phpt @@ -14,7 +14,6 @@ $values = array(10, "0x5F", true, false, - null, ); foreach ($values as $value) { @@ -39,4 +38,3 @@ string(6) "100111" decbin(): Argument #1 ($num) must be of type int, string given string(1) "1" string(1) "0" -string(1) "0" diff --git a/ext/standard/tests/math/decbin_variation1.phpt b/ext/standard/tests/math/decbin_variation1.phpt index fd9addc721..5ac82d41d6 100644 --- a/ext/standard/tests/math/decbin_variation1.phpt +++ b/ext/standard/tests/math/decbin_variation1.phpt @@ -9,9 +9,6 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php echo "*** Testing decbin() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -43,10 +40,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -66,12 +59,6 @@ $inputs = array( // object data /*24*/ new classA(), - // undefined data -/*25*/ @$undefined_var, - - // unset data -/*26*/ @$unset_var, - // resource variable /*27*/ $fp ); @@ -127,7 +114,7 @@ string(1) "0" string(1) "0" -- Iteration 12 -- -string(1) "0" +string(1) "1" -- Iteration 13 -- string(1) "0" @@ -139,37 +126,25 @@ string(1) "1" string(1) "0" -- Iteration 16 -- -string(1) "1" +decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 17 -- -string(1) "0" +decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 18 -- -decbin(): Argument #1 ($num) must be of type int, string given +decbin(): Argument #1 ($num) must be of type int, array given -- Iteration 19 -- decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 20 -- -decbin(): Argument #1 ($num) must be of type int, array given +decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 21 -- decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 22 -- -decbin(): Argument #1 ($num) must be of type int, string given - --- Iteration 23 -- -decbin(): Argument #1 ($num) must be of type int, string given - --- Iteration 24 -- decbin(): Argument #1 ($num) must be of type int, classA given --- Iteration 25 -- -string(1) "0" - --- Iteration 26 -- -string(1) "0" - --- Iteration 27 -- +-- Iteration 23 -- decbin(): Argument #1 ($num) must be of type int, resource given diff --git a/ext/standard/tests/math/decbin_variation1_64bit.phpt b/ext/standard/tests/math/decbin_variation1_64bit.phpt index f9e1b19b29..15bb864398 100644 --- a/ext/standard/tests/math/decbin_variation1_64bit.phpt +++ b/ext/standard/tests/math/decbin_variation1_64bit.phpt @@ -9,9 +9,6 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php echo "*** Testing decbin() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -43,10 +40,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -66,12 +59,6 @@ $inputs = array( // object data /*24*/ new classA(), - // undefined data -/*25*/ @$undefined_var, - - // unset data -/*26*/ @$unset_var, - // resource variable /*27*/ $fp ); @@ -125,7 +112,7 @@ string(1) "0" string(1) "0" -- Iteration 12 -- -string(1) "0" +string(1) "1" -- Iteration 13 -- string(1) "0" @@ -137,37 +124,25 @@ string(1) "1" string(1) "0" -- Iteration 16 -- -string(1) "1" +decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 17 -- -string(1) "0" +decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 18 -- -decbin(): Argument #1 ($num) must be of type int, string given +decbin(): Argument #1 ($num) must be of type int, array given -- Iteration 19 -- decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 20 -- -decbin(): Argument #1 ($num) must be of type int, array given +decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 21 -- decbin(): Argument #1 ($num) must be of type int, string given -- Iteration 22 -- -decbin(): Argument #1 ($num) must be of type int, string given - --- Iteration 23 -- -decbin(): Argument #1 ($num) must be of type int, string given - --- Iteration 24 -- decbin(): Argument #1 ($num) must be of type int, classA given --- Iteration 25 -- -string(1) "0" - --- Iteration 26 -- -string(1) "0" - --- Iteration 27 -- +-- Iteration 23 -- decbin(): Argument #1 ($num) must be of type int, resource given diff --git a/ext/standard/tests/math/dechex_basic.phpt b/ext/standard/tests/math/dechex_basic.phpt index 92e9c426b3..4fde95ebe7 100644 --- a/ext/standard/tests/math/dechex_basic.phpt +++ b/ext/standard/tests/math/dechex_basic.phpt @@ -14,7 +14,6 @@ $values = array(10, "0x5F", true, false, - null, ); foreach ($values as $value) { @@ -39,4 +38,3 @@ string(2) "27" dechex(): Argument #1 ($num) must be of type int, string given string(1) "1" string(1) "0" -string(1) "0" diff --git a/ext/standard/tests/math/dechex_variation1.phpt b/ext/standard/tests/math/dechex_variation1.phpt index 8add97f7a2..8fee0d42ad 100644 --- a/ext/standard/tests/math/dechex_variation1.phpt +++ b/ext/standard/tests/math/dechex_variation1.phpt @@ -9,9 +9,6 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php echo "*** Testing dechex() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -43,10 +40,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -66,12 +59,6 @@ $inputs = array( // object data /*24*/ new classA(), - // undefined data -/*25*/ @$undefined_var, - - // unset data -/*26*/ @$unset_var, - // resource variable /*27*/ $fp ); @@ -127,7 +114,7 @@ string(1) "0" string(1) "0" -- Iteration 12 -- -string(1) "0" +string(1) "1" -- Iteration 13 -- string(1) "0" @@ -139,37 +126,25 @@ string(1) "1" string(1) "0" -- Iteration 16 -- -string(1) "1" +dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 17 -- -string(1) "0" +dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 18 -- -dechex(): Argument #1 ($num) must be of type int, string given +dechex(): Argument #1 ($num) must be of type int, array given -- Iteration 19 -- dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 20 -- -dechex(): Argument #1 ($num) must be of type int, array given +dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 21 -- dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 22 -- -dechex(): Argument #1 ($num) must be of type int, string given - --- Iteration 23 -- -dechex(): Argument #1 ($num) must be of type int, string given - --- Iteration 24 -- dechex(): Argument #1 ($num) must be of type int, classA given --- Iteration 25 -- -string(1) "0" - --- Iteration 26 -- -string(1) "0" - --- Iteration 27 -- +-- Iteration 23 -- dechex(): Argument #1 ($num) must be of type int, resource given diff --git a/ext/standard/tests/math/dechex_variation1_64bit.phpt b/ext/standard/tests/math/dechex_variation1_64bit.phpt index 020bbcd22c..8435d2bc30 100644 --- a/ext/standard/tests/math/dechex_variation1_64bit.phpt +++ b/ext/standard/tests/math/dechex_variation1_64bit.phpt @@ -9,9 +9,6 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php echo "*** Testing dechex() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -43,10 +40,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -66,12 +59,6 @@ $inputs = array( // object data /*24*/ new classA(), - // undefined data -/*25*/ @$undefined_var, - - // unset data -/*26*/ @$unset_var, - // resource variable /*27*/ $fp ); @@ -126,7 +113,7 @@ string(1) "0" string(1) "0" -- Iteration 12 -- -string(1) "0" +string(1) "1" -- Iteration 13 -- string(1) "0" @@ -138,37 +125,25 @@ string(1) "1" string(1) "0" -- Iteration 16 -- -string(1) "1" +dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 17 -- -string(1) "0" +dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 18 -- -dechex(): Argument #1 ($num) must be of type int, string given +dechex(): Argument #1 ($num) must be of type int, array given -- Iteration 19 -- dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 20 -- -dechex(): Argument #1 ($num) must be of type int, array given +dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 21 -- dechex(): Argument #1 ($num) must be of type int, string given -- Iteration 22 -- -dechex(): Argument #1 ($num) must be of type int, string given - --- Iteration 23 -- -dechex(): Argument #1 ($num) must be of type int, string given - --- Iteration 24 -- dechex(): Argument #1 ($num) must be of type int, classA given --- Iteration 25 -- -string(1) "0" - --- Iteration 26 -- -string(1) "0" - --- Iteration 27 -- +-- Iteration 23 -- dechex(): Argument #1 ($num) must be of type int, resource given diff --git a/ext/standard/tests/math/decoct_basic.phpt b/ext/standard/tests/math/decoct_basic.phpt index 9252789b24..2bf63662f4 100644 --- a/ext/standard/tests/math/decoct_basic.phpt +++ b/ext/standard/tests/math/decoct_basic.phpt @@ -14,7 +14,6 @@ $values = array(10, "0x5F", true, false, - null, ); foreach ($values as $value) { @@ -39,4 +38,3 @@ string(2) "47" decoct(): Argument #1 ($num) must be of type int, string given string(1) "1" string(1) "0" -string(1) "0" diff --git a/ext/standard/tests/math/decoct_variation1.phpt b/ext/standard/tests/math/decoct_variation1.phpt index a236ea5367..608bb56873 100644 --- a/ext/standard/tests/math/decoct_variation1.phpt +++ b/ext/standard/tests/math/decoct_variation1.phpt @@ -9,10 +9,6 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php echo "*** Testing decoct() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); - // heredoc string $heredoc = <<<EOT @@ -44,10 +40,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -67,12 +59,6 @@ $inputs = array( // object data /*24*/ new classA(), - // undefined data -/*25*/ @$undefined_var, - - // unset data -/*26*/ @$unset_var, - // resource variable /*27*/ $fp ); @@ -127,7 +113,7 @@ string(1) "0" string(1) "0" -- Iteration 12 -- -string(1) "0" +string(1) "1" -- Iteration 13 -- string(1) "0" @@ -139,37 +125,25 @@ string(1) "1" string(1) "0" -- Iteration 16 -- -string(1) "1" +decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 17 -- -string(1) "0" +decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 18 -- -decoct(): Argument #1 ($num) must be of type int, string given +decoct(): Argument #1 ($num) must be of type int, array given -- Iteration 19 -- decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 20 -- -decoct(): Argument #1 ($num) must be of type int, array given +decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 21 -- decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 22 -- -decoct(): Argument #1 ($num) must be of type int, string given - --- Iteration 23 -- -decoct(): Argument #1 ($num) must be of type int, string given - --- Iteration 24 -- decoct(): Argument #1 ($num) must be of type int, classA given --- Iteration 25 -- -string(1) "0" - --- Iteration 26 -- -string(1) "0" - --- Iteration 27 -- +-- Iteration 23 -- decoct(): Argument #1 ($num) must be of type int, resource given diff --git a/ext/standard/tests/math/decoct_variation1_64bit.phpt b/ext/standard/tests/math/decoct_variation1_64bit.phpt index 2ecc212844..73650f5983 100644 --- a/ext/standard/tests/math/decoct_variation1_64bit.phpt +++ b/ext/standard/tests/math/decoct_variation1_64bit.phpt @@ -9,10 +9,6 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php echo "*** Testing decoct() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); - // heredoc string $heredoc = <<<EOT @@ -44,10 +40,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -67,12 +59,6 @@ $inputs = array( // object data /*24*/ new classA(), - // undefined data -/*25*/ @$undefined_var, - - // unset data -/*26*/ @$unset_var, - // resource variable /*27*/ $fp ); @@ -127,7 +113,7 @@ string(1) "0" string(1) "0" -- Iteration 12 -- -string(1) "0" +string(1) "1" -- Iteration 13 -- string(1) "0" @@ -139,37 +125,25 @@ string(1) "1" string(1) "0" -- Iteration 16 -- -string(1) "1" +decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 17 -- -string(1) "0" +decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 18 -- -decoct(): Argument #1 ($num) must be of type int, string given +decoct(): Argument #1 ($num) must be of type int, array given -- Iteration 19 -- decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 20 -- -decoct(): Argument #1 ($num) must be of type int, array given +decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 21 -- decoct(): Argument #1 ($num) must be of type int, string given -- Iteration 22 -- -decoct(): Argument #1 ($num) must be of type int, string given - --- Iteration 23 -- -decoct(): Argument #1 ($num) must be of type int, string given - --- Iteration 24 -- decoct(): Argument #1 ($num) must be of type int, classA given --- Iteration 25 -- -string(1) "0" - --- Iteration 26 -- -string(1) "0" - --- Iteration 27 -- +-- Iteration 23 -- decoct(): Argument #1 ($num) must be of type int, resource given diff --git a/ext/standard/tests/math/deg2rad_variation.phpt b/ext/standard/tests/math/deg2rad_variation.phpt index 01cee28b18..47a5a89367 100644 --- a/ext/standard/tests/math/deg2rad_variation.phpt +++ b/ext/standard/tests/math/deg2rad_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(0.40142572795869574) float(0.40927970959267024) float(0.40927970959267024) float(17.453292519943293) -float(0) float(0.017453292519943295) float(0) diff --git a/ext/standard/tests/math/exp_basic.phpt b/ext/standard/tests/math/exp_basic.phpt index cf67db2c7a..b10ab493a8 100644 --- a/ext/standard/tests/math/exp_basic.phpt +++ b/ext/standard/tests/math/exp_basic.phpt @@ -15,7 +15,6 @@ $values = array(10, "039", true, false, - null, ); $iterator = 1; @@ -59,6 +58,3 @@ float(2.718281828459) -- Iteration 11 -- float(1) - --- Iteration 12 -- -float(1) diff --git a/ext/standard/tests/math/expm1_basic.phpt b/ext/standard/tests/math/expm1_basic.phpt index 99a46e5599..ea4c165da2 100644 --- a/ext/standard/tests/math/expm1_basic.phpt +++ b/ext/standard/tests/math/expm1_basic.phpt @@ -16,7 +16,6 @@ $values = array(10, "039", true, false, - null, ); // loop through each element of $values to check the behaviour of expm1() @@ -62,6 +61,3 @@ float(1.718281828459) -- Iteration 11 -- float(0) - --- Iteration 12 -- -float(0) diff --git a/ext/standard/tests/math/floor_basic.phpt b/ext/standard/tests/math/floor_basic.phpt index 3e4650aaa6..308a055f80 100644 --- a/ext/standard/tests/math/floor_basic.phpt +++ b/ext/standard/tests/math/floor_basic.phpt @@ -33,7 +33,7 @@ foreach($values as $value) { }; ?> ---EXPECT-- +--EXPECTF-- *** Testing floor() : basic functionality *** -- floor 0 -- @@ -94,4 +94,6 @@ float(1) float(0) -- floor -- + +Deprecated: floor(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) diff --git a/ext/standard/tests/math/floor_variation1.phpt b/ext/standard/tests/math/floor_variation1.phpt index 0b5f09f27d..c9ec5e710c 100644 --- a/ext/standard/tests/math/floor_variation1.phpt +++ b/ext/standard/tests/math/floor_variation1.phpt @@ -71,13 +71,17 @@ foreach($inputs as $input) { }; fclose($fp); ?> ---EXPECT-- +--EXPECTF-- *** Testing floor() : usage variations *** -- Iteration 1 -- + +Deprecated: floor(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 2 -- + +Deprecated: floor(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 3 -- @@ -114,9 +118,13 @@ floor(): Argument #1 ($num) must be of type int|float, string given floor(): Argument #1 ($num) must be of type int|float, classA given -- Iteration 14 -- + +Deprecated: floor(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 15 -- + +Deprecated: floor(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 16 -- diff --git a/ext/standard/tests/math/fmod_basic.phpt b/ext/standard/tests/math/fmod_basic.phpt index 731b76adab..84cd27125c 100644 --- a/ext/standard/tests/math/fmod_basic.phpt +++ b/ext/standard/tests/math/fmod_basic.phpt @@ -13,7 +13,6 @@ $values1 = array(234, "234", "234.5", "23.45e1", - null, true, false); @@ -26,7 +25,6 @@ $values2 = array(2, "2", "2.3", "2.3e1", - null, true, false); for ($i = 0; $i < count($values1); $i++) { @@ -49,7 +47,6 @@ float(0) float(0) float(1.700000000000018) float(4) -float(NAN) float(0) float(NAN) @@ -63,7 +60,6 @@ float(-0) float(-0) float(-1.700000000000018) float(-4) -float(NAN) float(-0) float(NAN) @@ -77,7 +73,6 @@ float(0.5) float(0.5) float(2.200000000000018) float(4.5) -float(NAN) float(0.5) float(NAN) @@ -91,7 +86,6 @@ float(-0.5) float(-0.5) float(-2.200000000000018) float(-4.5) -float(NAN) float(-0.5) float(NAN) @@ -105,7 +99,6 @@ float(0) float(0) float(1.700000000000018) float(4) -float(NAN) float(0) float(NAN) @@ -119,7 +112,6 @@ float(0) float(0) float(1.700000000000018) float(4) -float(NAN) float(0) float(NAN) @@ -133,7 +125,6 @@ float(0) float(0) float(1.700000000000018) float(4) -float(NAN) float(0) float(NAN) @@ -147,7 +138,6 @@ float(0.5) float(0.5) float(2.200000000000018) float(4.5) -float(NAN) float(0.5) float(NAN) @@ -161,25 +151,10 @@ float(0.5) float(0.5) float(2.200000000000018) float(4.5) -float(NAN) float(0.5) float(NAN) iteration 9 -float(0) -float(0) -float(0) -float(0) -float(0) -float(0) -float(0) -float(0) -float(0) -float(NAN) -float(0) -float(NAN) - -iteration 10 float(1) float(1) float(1) @@ -189,11 +164,10 @@ float(1) float(1) float(1) float(1) -float(NAN) float(0) float(NAN) -iteration 11 +iteration 10 float(0) float(0) float(0) @@ -203,6 +177,5 @@ float(0) float(0) float(0) float(0) -float(NAN) float(0) float(NAN) diff --git a/ext/standard/tests/math/hexdec_basic.phpt b/ext/standard/tests/math/hexdec_basic.phpt index 748c641a1a..2f06b9650a 100644 --- a/ext/standard/tests/math/hexdec_basic.phpt +++ b/ext/standard/tests/math/hexdec_basic.phpt @@ -23,7 +23,7 @@ $values = array(0x123abc, '011237', true, false, - null); + ); for ($i = 0; $i < count($values); $i++) { $res = hexdec($values[$i]); var_dump($res); @@ -51,4 +51,3 @@ int(18279) int(70199) int(1) int(0) -int(0) diff --git a/ext/standard/tests/math/hexdec_basic_64bit.phpt b/ext/standard/tests/math/hexdec_basic_64bit.phpt index c7c59451f5..fd6d53b601 100644 --- a/ext/standard/tests/math/hexdec_basic_64bit.phpt +++ b/ext/standard/tests/math/hexdec_basic_64bit.phpt @@ -25,7 +25,7 @@ $values = array(0x123abc, '011237', true, false, - null); + ); foreach($values as $value) { echo "\n-- hexdec $value --\n"; @@ -90,6 +90,3 @@ int(1) -- hexdec -- int(0) - --- hexdec -- -int(0) diff --git a/ext/standard/tests/math/hexdec_variation1.phpt b/ext/standard/tests/math/hexdec_variation1.phpt index 703d30f086..65ebbe347b 100644 --- a/ext/standard/tests/math/hexdec_variation1.phpt +++ b/ext/standard/tests/math/hexdec_variation1.phpt @@ -9,9 +9,6 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); --FILE-- <?php echo "*** Testing hexdec() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -38,10 +35,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -58,12 +51,6 @@ $inputs = array( 'abcxyz', $heredoc, - // undefined data -/*24*/ @$undefined_var, - - // unset data -/*25*/ @$unset_var, - // resource variable /*26*/ $fp ); @@ -128,7 +115,7 @@ Deprecated: Invalid characters passed for attempted conversion, these have been int(5) -- Iteration 12 -- -int(0) +int(1) -- Iteration 13 -- int(0) @@ -140,40 +127,28 @@ int(1) int(0) -- Iteration 16 -- -int(1) +int(0) -- Iteration 17 -- int(0) -- Iteration 18 -- -int(0) - --- Iteration 19 -- -int(0) - --- Iteration 20 -- hexdec(): Argument #1 ($hex_string) must be of type string, array given --- Iteration 21 -- +-- Iteration 19 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(2748) --- Iteration 22 -- +-- Iteration 20 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(2748) --- Iteration 23 -- +-- Iteration 21 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(2748) --- Iteration 24 -- -int(0) - --- Iteration 25 -- -int(0) - --- Iteration 26 -- +-- Iteration 22 -- hexdec(): Argument #1 ($hex_string) must be of type string, resource given diff --git a/ext/standard/tests/math/hexdec_variation1_64bit.phpt b/ext/standard/tests/math/hexdec_variation1_64bit.phpt index 9c76afec0b..c892b8049f 100644 --- a/ext/standard/tests/math/hexdec_variation1_64bit.phpt +++ b/ext/standard/tests/math/hexdec_variation1_64bit.phpt @@ -9,9 +9,6 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); --FILE-- <?php echo "*** Testing hexdec() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -38,10 +35,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -58,12 +51,6 @@ $inputs = array( 'abcxyz', $heredoc, - // undefined data -/*24*/ @$undefined_var, - - // unset data -/*25*/ @$unset_var, - // resource variable /*26*/ $fp ); @@ -128,7 +115,7 @@ Deprecated: Invalid characters passed for attempted conversion, these have been int(5) -- Iteration 12 -- -int(0) +int(1) -- Iteration 13 -- int(0) @@ -140,40 +127,28 @@ int(1) int(0) -- Iteration 16 -- -int(1) +int(0) -- Iteration 17 -- int(0) -- Iteration 18 -- -int(0) - --- Iteration 19 -- -int(0) - --- Iteration 20 -- hexdec(): Argument #1 ($hex_string) must be of type string, array given --- Iteration 21 -- +-- Iteration 19 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(2748) --- Iteration 22 -- +-- Iteration 20 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(2748) --- Iteration 23 -- +-- Iteration 21 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(2748) --- Iteration 24 -- -int(0) - --- Iteration 25 -- -int(0) - --- Iteration 26 -- +-- Iteration 22 -- hexdec(): Argument #1 ($hex_string) must be of type string, resource given diff --git a/ext/standard/tests/math/hypot_basic.phpt b/ext/standard/tests/math/hypot_basic.phpt index 1b4b04f00a..750d688a17 100644 --- a/ext/standard/tests/math/hypot_basic.phpt +++ b/ext/standard/tests/math/hypot_basic.phpt @@ -16,7 +16,6 @@ $valuesy = array(23, "23", "23.45", "2.345e1", - null, true, false); @@ -29,7 +28,6 @@ $valuesx = array(33, "33", "43.45", "1.345e1", - null, true, false); @@ -62,8 +60,6 @@ Y:23 X:43.45 float(49.1620026036369) Y:23 X:1.345e1 float(26.6439955712352) -Y:23 X: float(23) - Y:23 X:1 float(23.0217288664427) Y:23 X: float(23) @@ -86,8 +82,6 @@ Y:-23 X:43.45 float(49.1620026036369) Y:-23 X:1.345e1 float(26.6439955712352) -Y:-23 X: float(23) - Y:-23 X:1 float(23.0217288664427) Y:-23 X: float(23) @@ -110,8 +104,6 @@ Y:23.45 X:43.45 float(49.3741329037787) Y:23.45 X:1.345e1 float(27.033405260899) -Y:23.45 X: float(23.45) - Y:23.45 X:1 float(23.4713122769052) Y:23.45 X: float(23.45) @@ -134,8 +126,6 @@ Y:-23.45 X:43.45 float(49.3741329037787) Y:-23.45 X:1.345e1 float(27.033405260899) -Y:-23.45 X: float(23.45) - Y:-23.45 X:1 float(23.4713122769052) Y:-23.45 X: float(23.45) @@ -158,8 +148,6 @@ Y:23 X:43.45 float(49.1620026036369) Y:23 X:1.345e1 float(26.6439955712352) -Y:23 X: float(23) - Y:23 X:1 float(23.0217288664427) Y:23 X: float(23) @@ -182,8 +170,6 @@ Y:23 X:43.45 float(49.1620026036369) Y:23 X:1.345e1 float(26.6439955712352) -Y:23 X: float(23) - Y:23 X:1 float(23.0217288664427) Y:23 X: float(23) @@ -206,8 +192,6 @@ Y:23 X:43.45 float(49.1620026036369) Y:23 X:1.345e1 float(26.6439955712352) -Y:23 X: float(23) - Y:23 X:1 float(23.0217288664427) Y:23 X: float(23) @@ -230,8 +214,6 @@ Y:23.45 X:43.45 float(49.3741329037787) Y:23.45 X:1.345e1 float(27.033405260899) -Y:23.45 X: float(23.45) - Y:23.45 X:1 float(23.4713122769052) Y:23.45 X: float(23.45) @@ -254,36 +236,10 @@ Y:2.345e1 X:43.45 float(49.3741329037787) Y:2.345e1 X:1.345e1 float(27.033405260899) -Y:2.345e1 X: float(23.45) - Y:2.345e1 X:1 float(23.4713122769052) Y:2.345e1 X: float(23.45) -Y: X:33 float(33) - -Y: X:-33 float(33) - -Y: X:33.45 float(33.45) - -Y: X:-33.45 float(33.45) - -Y: X:39 float(39) - -Y: X:31 float(31) - -Y: X:33 float(33) - -Y: X:43.45 float(43.45) - -Y: X:1.345e1 float(13.45) - -Y: X: float(0) - -Y: X:1 float(1) - -Y: X: float(0) - Y:1 X:33 float(33.0151480384384) Y:1 X:-33 float(33.0151480384384) @@ -302,8 +258,6 @@ Y:1 X:43.45 float(43.4615059564208) Y:1 X:1.345e1 float(13.4871234887206) -Y:1 X: float(1) - Y:1 X:1 float(1.4142135623731) Y:1 X: float(1) @@ -326,8 +280,6 @@ Y: X:43.45 float(43.45) Y: X:1.345e1 float(13.45) -Y: X: float(0) - Y: X:1 float(1) Y: X: float(0) diff --git a/ext/standard/tests/math/is_finite_basic.phpt b/ext/standard/tests/math/is_finite_basic.phpt index 9ee9d544e3..bc044e69ea 100644 --- a/ext/standard/tests/math/is_finite_basic.phpt +++ b/ext/standard/tests/math/is_finite_basic.phpt @@ -11,7 +11,6 @@ $values = array(234, "234", "234.5", "23.45e1", - null, true, false, pow(0, -2), @@ -34,6 +33,5 @@ bool(true) bool(true) bool(true) bool(true) -bool(true) bool(false) bool(false) diff --git a/ext/standard/tests/math/is_infinite_basic.phpt b/ext/standard/tests/math/is_infinite_basic.phpt index 076f202c14..0c7b076118 100644 --- a/ext/standard/tests/math/is_infinite_basic.phpt +++ b/ext/standard/tests/math/is_infinite_basic.phpt @@ -11,7 +11,6 @@ $values = array(234, "234", "234.5", "23.45e1", - null, true, false, pow(0, -2), @@ -34,6 +33,5 @@ bool(false) bool(false) bool(false) bool(false) -bool(false) bool(true) bool(false) diff --git a/ext/standard/tests/math/is_nan_basic.phpt b/ext/standard/tests/math/is_nan_basic.phpt index fabc40b97b..65555e25ae 100644 --- a/ext/standard/tests/math/is_nan_basic.phpt +++ b/ext/standard/tests/math/is_nan_basic.phpt @@ -11,7 +11,6 @@ $values = array(234, "234", "234.5", "23.45e1", - null, true, false, pow(0, -2), @@ -37,5 +36,4 @@ bool(false) bool(false) bool(false) bool(false) -bool(false) bool(true) diff --git a/ext/standard/tests/math/log10_variation.phpt b/ext/standard/tests/math/log10_variation.phpt index 6e73cd7bea..9da765d5ae 100644 --- a/ext/standard/tests/math/log10_variation.phpt +++ b/ext/standard/tests/math/log10_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(1.3617278360175928) float(1.3701428470511021) float(1.3701428470511021) float(3) -float(-INF) float(0) float(-INF) diff --git a/ext/standard/tests/math/log1p_basic.phpt b/ext/standard/tests/math/log1p_basic.phpt index c7ffe2ec18..7b19c3f9f4 100644 --- a/ext/standard/tests/math/log1p_basic.phpt +++ b/ext/standard/tests/math/log1p_basic.phpt @@ -15,7 +15,6 @@ $values = array(23, "23", "23.45", "2.345e1", - null, true, false); @@ -60,9 +59,6 @@ float(3.196630215920881) -- log1p 2.345e1 -- float(3.196630215920881) --- log1p -- -float(0) - -- log1p 1 -- float(0.6931471805599453) diff --git a/ext/standard/tests/math/log_basic.phpt b/ext/standard/tests/math/log_basic.phpt index 84e72bb14d..ae2e790bcc 100644 --- a/ext/standard/tests/math/log_basic.phpt +++ b/ext/standard/tests/math/log_basic.phpt @@ -13,7 +13,6 @@ $values = array(23, "23", "23.45", "2.345e1", - null, true, false); @@ -40,7 +39,6 @@ float(3.1354942159291497) float(3.1354942159291497) float(3.1548704948922883) float(3.1548704948922883) -float(-INF) float(0) float(-INF) @@ -54,6 +52,5 @@ float(2.2617809780285065) float(2.2617809780285065) float(2.275758008814007) float(2.275758008814007) -float(-INF) float(0) float(-INF) diff --git a/ext/standard/tests/math/mt_rand_basic.phpt b/ext/standard/tests/math/mt_rand_basic.phpt index 24050bbc8a..113ca32ee6 100644 --- a/ext/standard/tests/math/mt_rand_basic.phpt +++ b/ext/standard/tests/math/mt_rand_basic.phpt @@ -54,7 +54,6 @@ for ($x = 0; $x < count($min); $x++) { echo "\nNon-numeric cases\n"; $min = array(true, false, - null, "10", "10.5"); @@ -94,6 +93,5 @@ PASSED: range min = 256 max = 448 Non-numeric cases PASSED range min = 1 max = 100 PASSED range min = 0 max = 100 -PASSED range min = 0 max = 100 PASSED range min = 10 max = 100 PASSED range min = 10 max = 100 diff --git a/ext/standard/tests/math/mt_srand_basic.phpt b/ext/standard/tests/math/mt_srand_basic.phpt index ec0c24254d..71abbcb0aa 100644 --- a/ext/standard/tests/math/mt_srand_basic.phpt +++ b/ext/standard/tests/math/mt_srand_basic.phpt @@ -11,7 +11,6 @@ var_dump(mt_srand("500")); var_dump(mt_srand("500E3")); var_dump(mt_srand(true)); var_dump(mt_srand(false)); -var_dump(mt_srand(NULL)); ?> --EXPECT-- NULL @@ -21,4 +20,3 @@ NULL NULL NULL NULL -NULL diff --git a/ext/standard/tests/math/number_format_basic.phpt b/ext/standard/tests/math/number_format_basic.phpt index b82ad5c753..022e573b01 100644 --- a/ext/standard/tests/math/number_format_basic.phpt +++ b/ext/standard/tests/math/number_format_basic.phpt @@ -11,7 +11,6 @@ $values = array(1234.5678, "123456789", "123.456789", "12.3456789e1", - null, true, false); @@ -40,7 +39,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> --EXPECT-- - number_format tests.....default +number_format tests.....default string(5) "1,235" string(6) "-1,235" string(10) "12,346,578" @@ -50,7 +49,6 @@ string(11) "402,653,183" string(11) "123,456,789" string(3) "123" string(3) "123" -string(1) "0" string(1) "1" string(1) "0" @@ -64,7 +62,6 @@ string(14) "402,653,183.00" string(14) "123,456,789.00" string(6) "123.46" string(6) "123.46" -string(4) "0.00" string(4) "1.00" string(4) "0.00" @@ -78,7 +75,6 @@ string(14) "402 653 183.00" string(14) "123 456 789.00" string(6) "123.46" string(6) "123.46" -string(4) "0.00" string(4) "1.00" string(4) "0.00" @@ -92,6 +88,5 @@ string(14) "402 653 183,00" string(14) "123 456 789,00" string(6) "123,46" string(6) "123,46" -string(4) "0,00" string(4) "1,00" string(4) "0,00" diff --git a/ext/standard/tests/math/number_format_multichar.phpt b/ext/standard/tests/math/number_format_multichar.phpt index 5648257e03..1ed823042f 100644 --- a/ext/standard/tests/math/number_format_multichar.phpt +++ b/ext/standard/tests/math/number_format_multichar.phpt @@ -11,7 +11,6 @@ $values = array(1234.5678, "123456789", "123.456789", "12.3456789e1", - null, true, false); @@ -34,7 +33,7 @@ for ($i = 0; $i < count($values); $i++) { } ?> --EXPECT-- - number_format tests.....multiple character decimal point +number_format tests.....multiple character decimal point string(13) "1 234·57" string(14) "-1 234·57" string(18) "12 346 578·00" @@ -44,7 +43,6 @@ string(19) "402 653 183·00" string(19) "123 456 789·00" string(11) "123·46" string(11) "123·46" -string(9) "0·00" string(9) "1·00" string(9) "0·00" @@ -58,7 +56,6 @@ string(28) "402 653 183.00" string(28) "123 456 789.00" string(6) "123.46" string(6) "123.46" -string(4) "0.00" string(4) "1.00" string(4) "0.00" @@ -72,6 +69,5 @@ string(33) "402 653 183·00" string(33) "123 456 789·00" string(11) "123·46" string(11) "123·46" -string(9) "0·00" string(9) "1·00" string(9) "0·00" diff --git a/ext/standard/tests/math/octdec_basic.phpt b/ext/standard/tests/math/octdec_basic.phpt index 1daf9a4338..4c3ffc8b8a 100644 --- a/ext/standard/tests/math/octdec_basic.phpt +++ b/ext/standard/tests/math/octdec_basic.phpt @@ -22,7 +22,7 @@ $values = array(01234567, 31.1013e5, true, false, - null); + ); for ($i = 0; $i < count($values); $i++) { $res = octdec($values[$i]); @@ -57,4 +57,3 @@ int(102923) int(823384) int(1) int(0) -int(0) diff --git a/ext/standard/tests/math/octdec_basic_64bit.phpt b/ext/standard/tests/math/octdec_basic_64bit.phpt index bb8f70085d..4051d9be63 100644 --- a/ext/standard/tests/math/octdec_basic_64bit.phpt +++ b/ext/standard/tests/math/octdec_basic_64bit.phpt @@ -25,7 +25,7 @@ $values = array(01234567, 31.1013e5, true, false, - null); + ); for ($i = 0; $i < count($values); $i++) { $res = octdec($values[$i]); @@ -62,4 +62,3 @@ int(102923) int(823384) int(1) int(0) -int(0) diff --git a/ext/standard/tests/math/octdec_variation1.phpt b/ext/standard/tests/math/octdec_variation1.phpt index 6ee2b6f91c..c24d2e8e6b 100644 --- a/ext/standard/tests/math/octdec_variation1.phpt +++ b/ext/standard/tests/math/octdec_variation1.phpt @@ -5,9 +5,6 @@ precision=14 --FILE-- <?php echo "*** Testing octdec() : usage variations ***\n"; -//get an unset variable -$unset_var = 10; -unset ($unset_var); // heredoc string $heredoc = <<<EOT @@ -34,10 +31,6 @@ $inputs = array( 12.3456789000E-10, .5, - // null data -/*12*/ NULL, - null, - // boolean data /*14*/ true, false, @@ -54,12 +47,6 @@ $inputs = array( 'abcxyz', $heredoc, - // undefined data -/*24*/ @$undefined_var, - - // unset data -/*25*/ @$unset_var, - // resource variable /*26*/ $fp ); @@ -131,7 +118,7 @@ Deprecated: Invalid characters passed for attempted conversion, these have been int(5) -- Iteration 12 -- -int(0) +int(1) -- Iteration 13 -- int(0) @@ -143,41 +130,29 @@ int(1) int(0) -- Iteration 16 -- -int(1) +int(0) -- Iteration 17 -- int(0) -- Iteration 18 -- -int(0) - --- Iteration 19 -- -int(0) - --- Iteration 20 -- octdec(): Argument #1 ($octal_string) must be of type string, array given --- Iteration 21 -- +-- Iteration 19 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 22 -- +-- Iteration 20 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 23 -- +-- Iteration 21 -- Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d int(0) --- Iteration 24 -- -int(0) - --- Iteration 25 -- -int(0) - --- Iteration 26 -- +-- Iteration 22 -- octdec(): Argument #1 ($octal_string) must be of type string, resource given ---Done--- diff --git a/ext/standard/tests/math/rad2deg_variation.phpt b/ext/standard/tests/math/rad2deg_variation.phpt index 122d5b2c13..3cc1317ea8 100644 --- a/ext/standard/tests/math/rad2deg_variation.phpt +++ b/ext/standard/tests/math/rad2deg_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(1317.8029288008934) float(1343.5860295817804) float(1343.5860295817804) float(57295.77951308232) -float(0) float(57.29577951308232) float(0) diff --git a/ext/standard/tests/math/rand_basic.phpt b/ext/standard/tests/math/rand_basic.phpt index 87e9d7cd42..06b46b2277 100644 --- a/ext/standard/tests/math/rand_basic.phpt +++ b/ext/standard/tests/math/rand_basic.phpt @@ -54,7 +54,6 @@ for ($x = 0; $x < count($min); $x++) { echo "\nNon-numeric cases\n"; $min = array(true, false, - null, "10", "10.5"); @@ -94,6 +93,5 @@ PASSED: range min = 256 max = 448 Non-numeric cases PASSED range min = 1 max = 100 PASSED range min = 0 max = 100 -PASSED range min = 0 max = 100 PASSED range min = 10 max = 100 PASSED range min = 10 max = 100 diff --git a/ext/standard/tests/math/round_basic.phpt b/ext/standard/tests/math/round_basic.phpt index 8f2ded09f3..44aacf2eec 100644 --- a/ext/standard/tests/math/round_basic.phpt +++ b/ext/standard/tests/math/round_basic.phpt @@ -25,7 +25,6 @@ $precision = array(2, "04", "3.6", "2.1e1", - null, true, false); @@ -50,7 +49,6 @@ round: 123456789 ...with precision 04-> float(123456789) ...with precision 3.6-> float(123456789) ...with precision 2.1e1-> float(123456789) -...with precision -> float(123456789) ...with precision 1-> float(123456789) ...with precision -> float(123456789) round: 123.456789 @@ -63,7 +61,6 @@ round: 123.456789 ...with precision 04-> float(123.4568) ...with precision 3.6-> float(123.457) ...with precision 2.1e1-> float(123.456789) -...with precision -> float(123) ...with precision 1-> float(123.5) ...with precision -> float(123) round: -4.5679123 @@ -76,7 +73,6 @@ round: -4.5679123 ...with precision 04-> float(-4.5679) ...with precision 3.6-> float(-4.568) ...with precision 2.1e1-> float(-4.5679123) -...with precision -> float(-5) ...with precision 1-> float(-4.6) ...with precision -> float(-5) round: 12300 @@ -89,7 +85,6 @@ round: 12300 ...with precision 04-> float(12300) ...with precision 3.6-> float(12300) ...with precision 2.1e1-> float(12300) -...with precision -> float(12300) ...with precision 1-> float(12300) ...with precision -> float(12300) round: -4567 @@ -102,7 +97,6 @@ round: -4567 ...with precision 04-> float(-4567) ...with precision 3.6-> float(-4567) ...with precision 2.1e1-> float(-4567) -...with precision -> float(-4567) ...with precision 1-> float(-4567) ...with precision -> float(-4567) round: 2311527 @@ -115,7 +109,6 @@ round: 2311527 ...with precision 04-> float(2311527) ...with precision 3.6-> float(2311527) ...with precision 2.1e1-> float(2311527) -...with precision -> float(2311527) ...with precision 1-> float(2311527) ...with precision -> float(2311527) round: 14680063 @@ -128,7 +121,6 @@ round: 14680063 ...with precision 04-> float(14680063) ...with precision 3.6-> float(14680063) ...with precision 2.1e1-> float(14680063) -...with precision -> float(14680063) ...with precision 1-> float(14680063) ...with precision -> float(14680063) round: 1.234567 @@ -141,7 +133,6 @@ round: 1.234567 ...with precision 04-> float(1.2346) ...with precision 3.6-> float(1.235) ...with precision 2.1e1-> float(1.234567) -...with precision -> float(1) ...with precision 1-> float(1.2) ...with precision -> float(1) round: 2.3456789e8 @@ -154,6 +145,5 @@ round: 2.3456789e8 ...with precision 04-> float(234567890) ...with precision 3.6-> float(234567890) ...with precision 2.1e1-> float(234567890) -...with precision -> float(234567890) ...with precision 1-> float(234567890) ...with precision -> float(234567890) diff --git a/ext/standard/tests/math/round_variation1.phpt b/ext/standard/tests/math/round_variation1.phpt index b6ce56dd4a..2a2adf27ca 100644 --- a/ext/standard/tests/math/round_variation1.phpt +++ b/ext/standard/tests/math/round_variation1.phpt @@ -85,7 +85,7 @@ foreach($inputs as $input) { }; fclose($fp); ?> ---EXPECT-- +--EXPECTF-- *** Testing round() : usage variations *** -- Iteration 1 -- @@ -119,9 +119,13 @@ float(1.23457E-9) float(0.5) -- Iteration 11 -- + +Deprecated: round(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 12 -- + +Deprecated: round(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 13 -- @@ -158,9 +162,13 @@ round(): Argument #1 ($num) must be of type int|float, string given round(): Argument #1 ($num) must be of type int|float, classA given -- Iteration 24 -- + +Deprecated: round(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 25 -- + +Deprecated: round(): Passing null to parameter #1 ($num) of type int|float is deprecated in %s on line %d float(0) -- Iteration 26 -- diff --git a/ext/standard/tests/math/sin_variation.phpt b/ext/standard/tests/math/sin_variation.phpt index 84c5b60c7b..6cca50a167 100644 --- a/ext/standard/tests/math/sin_variation.phpt +++ b/ext/standard/tests/math/sin_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(-0.8462204042) float(-0.9937407102) float(-0.9937407102) float(0.8268795405) -float(0) float(0.8414709848) float(0) diff --git a/ext/standard/tests/math/sinh_variation.phpt b/ext/standard/tests/math/sinh_variation.phpt index 4a26efb50a..f053e58144 100644 --- a/ext/standard/tests/math/sinh_variation.phpt +++ b/ext/standard/tests/math/sinh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(4872401723) float(7641446995) float(7641446995) float(INF) -float(0) float(1.175201194) float(0) diff --git a/ext/standard/tests/math/sqrt_variation.phpt b/ext/standard/tests/math/sqrt_variation.phpt index b0683b701a..eb73870d1f 100644 --- a/ext/standard/tests/math/sqrt_variation.phpt +++ b/ext/standard/tests/math/sqrt_variation.phpt @@ -22,7 +22,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -44,6 +43,5 @@ float(4.795831523312719) float(4.8425200051213) float(4.8425200051213) float(31.622776601683793) -float(0) float(1) float(0) diff --git a/ext/standard/tests/math/srand_basic.phpt b/ext/standard/tests/math/srand_basic.phpt index d3a5447553..ce9a4e3f97 100644 --- a/ext/standard/tests/math/srand_basic.phpt +++ b/ext/standard/tests/math/srand_basic.phpt @@ -13,7 +13,6 @@ var_dump(srand("500")); var_dump(srand("500E3")); var_dump(srand(true)); var_dump(srand(false)); -var_dump(srand(NULL)); ?> --EXPECT-- *** Testing srand() : basic functionality *** @@ -24,4 +23,3 @@ NULL NULL NULL NULL -NULL diff --git a/ext/standard/tests/math/tan_variation.phpt b/ext/standard/tests/math/tan_variation.phpt index 602db48e49..4394ddcd57 100644 --- a/ext/standard/tests/math/tan_variation.phpt +++ b/ext/standard/tests/math/tan_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(1.588153083) float(8.895619796) float(8.895619796) float(1.470324156) -float(0) float(1.557407725) float(0) diff --git a/ext/standard/tests/math/tanh_variation.phpt b/ext/standard/tests/math/tanh_variation.phpt index aab33fea60..d2011f4745 100644 --- a/ext/standard/tests/math/tanh_variation.phpt +++ b/ext/standard/tests/math/tanh_variation.phpt @@ -21,7 +21,6 @@ $values = array(23, "23.45", "2.345e1", "1000", - null, true, false); @@ -42,6 +41,5 @@ float(1) float(1) float(1) float(1) -float(0) float(0.7615941559557649) float(0) |