diff options
author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-05-01 13:14:54 +0200 |
---|---|---|
committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-05-01 15:33:58 +0200 |
commit | 31a626cf7e53ddb13e9f3cd3c094fbd04a59e10c (patch) | |
tree | a2256c468bfb3569e9ff1df7e40658782acfa0aa /ext/standard | |
parent | 1d2044367978f468720f2f76622e6ee0ed849b75 (diff) | |
download | php-git-31a626cf7e53ddb13e9f3cd3c094fbd04a59e10c.tar.gz |
Remove the deprecated is_real() function
Closes GH-5506
Diffstat (limited to 'ext/standard')
-rwxr-xr-x | ext/standard/basic_functions.stub.php | 7 | ||||
-rwxr-xr-x | ext/standard/basic_functions_arginfo.h | 3 | ||||
-rw-r--r-- | ext/standard/tests/general_functions/is_float.phpt | 83 | ||||
-rw-r--r-- | ext/standard/tests/general_functions/is_float_64bit.phpt | 83 |
4 files changed, 14 insertions, 162 deletions
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 7294c2ecf0..c8c473d0db 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -1438,13 +1438,6 @@ function is_float($value): bool {} */ function is_double($value): bool {} -/** - * @param mixed $value - * @alias is_float - * @deprecated - */ -function is_real($value): bool {} - /** @param mixed $value */ function is_numeric($value): bool {} diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index d170f5dbd2..985c57bcac 100755 --- a/ext/standard/basic_functions_arginfo.h +++ b/ext/standard/basic_functions_arginfo.h @@ -2093,8 +2093,6 @@ ZEND_END_ARG_INFO() #define arginfo_is_double arginfo_boolval -#define arginfo_is_real arginfo_boolval - #define arginfo_is_numeric arginfo_boolval #define arginfo_is_string arginfo_boolval @@ -3454,7 +3452,6 @@ static const zend_function_entry ext_functions[] = { ZEND_FALIAS(is_long, is_int, arginfo_is_long) ZEND_FE(is_float, arginfo_is_float) ZEND_FALIAS(is_double, is_float, arginfo_is_double) - ZEND_FALIAS(is_real, is_float, arginfo_is_real) ZEND_FE(is_numeric, arginfo_is_numeric) ZEND_FE(is_string, arginfo_is_string) ZEND_FE(is_array, arginfo_is_array) diff --git a/ext/standard/tests/general_functions/is_float.phpt b/ext/standard/tests/general_functions/is_float.phpt index 76cfa80565..f29816f606 100644 --- a/ext/standard/tests/general_functions/is_float.phpt +++ b/ext/standard/tests/general_functions/is_float.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_float() & it's FALIASes: is_double() & is_real() functions +Test is_float() & its is_double() alias --SKIPIF-- <?php if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); @@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); * Description: Finds whether the given variable is a float */ -echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; +echo "*** Testing is_float(), is_double() with float values***\n"; // different valid float values $floats = array( -2147483649, // float value @@ -44,17 +44,16 @@ $floats = array( .0034E-30, -.0034E-30 ); -/* loop to check that is_float(), is_double() & is_real() recognizes +/* loop to check that is_float(), is_double() & recognizes different float values, expected: bool(true) */ $loop_counter = 1; foreach ($floats as $float ) { echo "-- Iteration $loop_counter --\n"; $loop_counter++; var_dump( is_float($float) ); var_dump( is_double($float) ); - var_dump( @is_real($float) ); } -echo "\n*** Testing is_float(), is_double() & is_real() with non float values ***\n"; +echo "\n*** Testing is_float(), is_double() with non float values ***\n"; // get a resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( __DIR__ ); @@ -117,14 +116,13 @@ $not_floats = array ( @$undefined_var ); /* loop through the $not_floats to see working of - is_float(), is_double() & is_real() on objects, + is_float(), is_double() on objects, arrays, boolean and others */ $loop_counter = 1; foreach ($not_floats as $value ) { echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_float($value) ); var_dump( is_double($value) ); - var_dump( @is_real($value) ); } echo "Done\n"; @@ -135,275 +133,208 @@ closedir($dfp); ?> --EXPECTF-- -*** Testing is_float(), is_double() and is_real() with float values*** +*** Testing is_float(), is_double() with float values*** -- Iteration 1 -- bool(true) bool(true) -bool(true) -- Iteration 2 -- bool(true) bool(true) -bool(true) -- Iteration 3 -- bool(true) bool(true) -bool(true) -- Iteration 4 -- bool(true) bool(true) -bool(true) -- Iteration 5 -- bool(true) bool(true) -bool(true) -- Iteration 6 -- bool(true) bool(true) -bool(true) -- Iteration 7 -- bool(true) bool(true) -bool(true) -- Iteration 8 -- bool(true) bool(true) -bool(true) -- Iteration 9 -- bool(true) bool(true) -bool(true) -- Iteration 10 -- bool(true) bool(true) -bool(true) -- Iteration 11 -- bool(true) bool(true) -bool(true) -- Iteration 12 -- bool(true) bool(true) -bool(true) -- Iteration 13 -- bool(true) bool(true) -bool(true) -- Iteration 14 -- bool(true) bool(true) -bool(true) -- Iteration 15 -- bool(true) bool(true) -bool(true) -- Iteration 16 -- bool(true) bool(true) -bool(true) -- Iteration 17 -- bool(true) bool(true) -bool(true) -- Iteration 18 -- bool(true) bool(true) -bool(true) -- Iteration 19 -- bool(true) bool(true) -bool(true) -- Iteration 20 -- bool(true) bool(true) -bool(true) -- Iteration 21 -- bool(true) bool(true) -bool(true) -- Iteration 22 -- bool(true) bool(true) -bool(true) -- Iteration 23 -- bool(true) bool(true) -bool(true) -- Iteration 24 -- bool(true) bool(true) -bool(true) -- Iteration 25 -- bool(true) bool(true) -bool(true) -- Iteration 26 -- bool(true) bool(true) -bool(true) -- Iteration 27 -- bool(true) bool(true) -bool(true) -- Iteration 28 -- bool(true) bool(true) -bool(true) -- Iteration 29 -- bool(true) bool(true) -bool(true) -- Iteration 30 -- bool(true) bool(true) -bool(true) -*** Testing is_float(), is_double() & is_real() with non float values *** +*** Testing is_float(), is_double() with non float values *** --Iteration 1-- bool(false) bool(false) -bool(false) --Iteration 2-- bool(false) bool(false) -bool(false) --Iteration 3-- bool(false) bool(false) -bool(false) --Iteration 4-- bool(false) bool(false) -bool(false) --Iteration 5-- bool(false) bool(false) -bool(false) --Iteration 6-- bool(false) bool(false) -bool(false) --Iteration 7-- bool(false) bool(false) -bool(false) --Iteration 8-- bool(false) bool(false) -bool(false) --Iteration 9-- bool(false) bool(false) -bool(false) --Iteration 10-- bool(false) bool(false) -bool(false) --Iteration 11-- bool(false) bool(false) -bool(false) --Iteration 12-- bool(false) bool(false) -bool(false) --Iteration 13-- bool(false) bool(false) -bool(false) --Iteration 14-- bool(false) bool(false) -bool(false) --Iteration 15-- bool(false) bool(false) -bool(false) --Iteration 16-- bool(false) bool(false) -bool(false) --Iteration 17-- bool(false) bool(false) -bool(false) --Iteration 18-- bool(false) bool(false) -bool(false) --Iteration 19-- bool(false) bool(false) -bool(false) --Iteration 20-- bool(false) bool(false) -bool(false) --Iteration 21-- bool(false) bool(false) -bool(false) --Iteration 22-- bool(false) bool(false) -bool(false) --Iteration 23-- bool(false) bool(false) -bool(false) --Iteration 24-- bool(false) bool(false) -bool(false) --Iteration 25-- bool(false) bool(false) -bool(false) --Iteration 26-- bool(false) bool(false) -bool(false) --Iteration 27-- bool(false) bool(false) -bool(false) --Iteration 28-- bool(false) bool(false) -bool(false) --Iteration 29-- bool(false) bool(false) -bool(false) --Iteration 30-- bool(false) bool(false) -bool(false) --Iteration 31-- bool(false) bool(false) -bool(false) --Iteration 32-- bool(false) bool(false) -bool(false) --Iteration 33-- bool(false) bool(false) -bool(false) --Iteration 34-- bool(false) bool(false) -bool(false) --Iteration 35-- bool(false) bool(false) -bool(false) --Iteration 36-- bool(false) bool(false) -bool(false) --Iteration 37-- bool(false) bool(false) -bool(false) Done diff --git a/ext/standard/tests/general_functions/is_float_64bit.phpt b/ext/standard/tests/general_functions/is_float_64bit.phpt index 1815e53c00..4992bb51c4 100644 --- a/ext/standard/tests/general_functions/is_float_64bit.phpt +++ b/ext/standard/tests/general_functions/is_float_64bit.phpt @@ -1,5 +1,5 @@ --TEST-- -Test is_float() & it's FALIASes: is_double() & is_real() functions +Test is_float() & its is_double() alias --SKIPIF-- <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); @@ -12,7 +12,7 @@ precision=14 * Description: Finds whether the given variable is a float */ -echo "*** Testing is_float(), is_double() and is_real() with float values***\n"; +echo "*** Testing is_float(), is_double() with float values***\n"; // different valid float values $floats = array( -2147483649, // float value @@ -46,17 +46,16 @@ $floats = array( .0034E-30, -.0034E-30 ); -/* loop to check that is_float(), is_double() & is_real() recognizes +/* loop to check that is_float(), is_double() recognizes different float values, expected: bool(true) */ $loop_counter = 1; foreach ($floats as $float ) { echo "-- Iteration $loop_counter --\n"; $loop_counter++; var_dump( is_float($float) ); var_dump( is_double($float) ); - var_dump( @is_real($float) ); } -echo "\n*** Testing is_float(), is_double() & is_real() with non float values ***\n"; +echo "\n*** Testing is_float(), is_double() with non float values ***\n"; // get a resource type variable $fp = fopen (__FILE__, "r"); $dfp = opendir ( __DIR__ ); @@ -119,288 +118,220 @@ $not_floats = array ( @$undefined_var ); /* loop through the $not_floats to see working of - is_float(), is_double() & is_real() on objects, + is_float(), is_double() on objects, arrays, boolean and others */ $loop_counter = 1; foreach ($not_floats as $value ) { echo "--Iteration $loop_counter--\n"; $loop_counter++; var_dump( is_float($value) ); var_dump( is_double($value) ); - var_dump( @is_real($value) ); } echo "Done\n"; ?> --EXPECT-- -*** Testing is_float(), is_double() and is_real() with float values*** +*** Testing is_float(), is_double() with float values*** -- Iteration 1 -- bool(false) bool(false) -bool(false) -- Iteration 2 -- bool(false) bool(false) -bool(false) -- Iteration 3 -- bool(false) bool(false) -bool(false) -- Iteration 4 -- bool(false) bool(false) -bool(false) -- Iteration 5 -- bool(false) bool(false) -bool(false) -- Iteration 6 -- bool(false) bool(false) -bool(false) -- Iteration 7 -- bool(true) bool(true) -bool(true) -- Iteration 8 -- bool(true) bool(true) -bool(true) -- Iteration 9 -- bool(true) bool(true) -bool(true) -- Iteration 10 -- bool(true) bool(true) -bool(true) -- Iteration 11 -- bool(true) bool(true) -bool(true) -- Iteration 12 -- bool(true) bool(true) -bool(true) -- Iteration 13 -- bool(true) bool(true) -bool(true) -- Iteration 14 -- bool(true) bool(true) -bool(true) -- Iteration 15 -- bool(true) bool(true) -bool(true) -- Iteration 16 -- bool(true) bool(true) -bool(true) -- Iteration 17 -- bool(true) bool(true) -bool(true) -- Iteration 18 -- bool(true) bool(true) -bool(true) -- Iteration 19 -- bool(true) bool(true) -bool(true) -- Iteration 20 -- bool(true) bool(true) -bool(true) -- Iteration 21 -- bool(true) bool(true) -bool(true) -- Iteration 22 -- bool(true) bool(true) -bool(true) -- Iteration 23 -- bool(true) bool(true) -bool(true) -- Iteration 24 -- bool(true) bool(true) -bool(true) -- Iteration 25 -- bool(true) bool(true) -bool(true) -- Iteration 26 -- bool(true) bool(true) -bool(true) -- Iteration 27 -- bool(true) bool(true) -bool(true) -- Iteration 28 -- bool(true) bool(true) -bool(true) -- Iteration 29 -- bool(true) bool(true) -bool(true) -- Iteration 30 -- bool(true) bool(true) -bool(true) -*** Testing is_float(), is_double() & is_real() with non float values *** +*** Testing is_float(), is_double() with non float values *** --Iteration 1-- bool(false) bool(false) -bool(false) --Iteration 2-- bool(false) bool(false) -bool(false) --Iteration 3-- bool(false) bool(false) -bool(false) --Iteration 4-- bool(false) bool(false) -bool(false) --Iteration 5-- bool(false) bool(false) -bool(false) --Iteration 6-- bool(false) bool(false) -bool(false) --Iteration 7-- bool(false) bool(false) -bool(false) --Iteration 8-- bool(false) bool(false) -bool(false) --Iteration 9-- bool(false) bool(false) -bool(false) --Iteration 10-- bool(false) bool(false) -bool(false) --Iteration 11-- bool(false) bool(false) -bool(false) --Iteration 12-- bool(false) bool(false) -bool(false) --Iteration 13-- bool(false) bool(false) -bool(false) --Iteration 14-- bool(false) bool(false) -bool(false) --Iteration 15-- bool(false) bool(false) -bool(false) --Iteration 16-- bool(false) bool(false) -bool(false) --Iteration 17-- bool(false) bool(false) -bool(false) --Iteration 18-- bool(false) bool(false) -bool(false) --Iteration 19-- bool(false) bool(false) -bool(false) --Iteration 20-- bool(false) bool(false) -bool(false) --Iteration 21-- bool(false) bool(false) -bool(false) --Iteration 22-- bool(false) bool(false) -bool(false) --Iteration 23-- bool(false) bool(false) -bool(false) --Iteration 24-- bool(false) bool(false) -bool(false) --Iteration 25-- bool(false) bool(false) -bool(false) --Iteration 26-- bool(false) bool(false) -bool(false) --Iteration 27-- bool(false) bool(false) -bool(false) --Iteration 28-- bool(false) bool(false) -bool(false) --Iteration 29-- bool(false) bool(false) -bool(false) --Iteration 30-- bool(false) bool(false) -bool(false) --Iteration 31-- bool(false) bool(false) -bool(false) --Iteration 32-- bool(false) bool(false) -bool(false) --Iteration 33-- bool(false) bool(false) -bool(false) --Iteration 34-- bool(false) bool(false) -bool(false) --Iteration 35-- bool(false) bool(false) -bool(false) --Iteration 36-- bool(false) bool(false) -bool(false) --Iteration 37-- bool(false) bool(false) -bool(false) Done |