diff options
| author | Anatol Belski <ab@php.net> | 2014-12-15 07:01:29 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-15 07:01:29 +0100 |
| commit | 5ff59f986c2037efa9d2af2d97e274078748450c (patch) | |
| tree | 9bdd1f5f8d117d4d0317ef076aaf208bce1cd796 /ext/standard/basic_functions.c | |
| parent | a857f3a147a4856807101a66cdfd58befa2cb489 (diff) | |
| parent | 7950429626f02afe77a45da6236f3eec84b49eff (diff) | |
| download | php-git-5ff59f986c2037efa9d2af2d97e274078748450c.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* 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
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index bbad6bc7d7..40869f5ce0 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -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) |