archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master' into native-tls

Browse source 
* origin/master:
  Revert HTTP status codes merger
  fixed tests, bugs in status codes merger
  Fixed bug #55415 (php_info produces invalid anchor names)
  NEWS
  Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes)
  NEWS
  Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github
  NEWS
  Change is_long() to be an alias of is_integer()
  Fix indentation
  Share HTTP status codes map
This commit is contained in:
Anatol Belski 2014-12-15 07:01:29 +01:00
commit 5ff59f986c
5 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/standard/basic_functions.c
View file

@ -2513,7 +2513,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_is_bool, 0)
ZEND_ARG_INFO(0, var)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_is_long, 0)
ZEND_BEGIN_ARG_INFO(arginfo_is_int, 0)
ZEND_ARG_INFO(0, var)
ZEND_END_ARG_INFO()
@ -3027,10 +3027,10 @@ const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(is_null, arginfo_is_null)
PHP_FE(is_resource, arginfo_is_resource)
PHP_FE(is_bool, arginfo_is_bool)
PHP_FE(is_long, arginfo_is_long)
PHP_FE(is_int, arginfo_is_int)
PHP_FE(is_float, arginfo_is_float)
PHP_FALIAS(is_int, is_long, arginfo_is_long)
PHP_FALIAS(is_integer, is_long, arginfo_is_long)
PHP_FALIAS(is_integer, is_int, arginfo_is_int)
PHP_FALIAS(is_long, is_int, arginfo_is_int)
PHP_FALIAS(is_double, is_float, arginfo_is_float)
PHP_FALIAS(is_real, is_float, arginfo_is_float)
PHP_FE(is_numeric, arginfo_is_numeric)