Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík...

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index fbccd5d4d2328d4da9baef59440921f61d5d053c..479ac7b8a2de0f8c54b28064fd47f6ce095c63be 100644 (file)
--- 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_integer, 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_integer,                                                                                                              arginfo_is_integer)
+       PHP_FE(is_int,                                                                                                                  arginfo_is_int)
        PHP_FE(is_float,                                                                                                                arginfo_is_float)
-       PHP_FALIAS(is_int,                              is_integer,                                                             arginfo_is_integer)
-       PHP_FALIAS(is_long,                             is_integer,                                                             arginfo_is_integer)
+       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)

diff --git a/ext/standard/php_type.h b/ext/standard/php_type.h
index 9ecfcd6d15674a0a7393b5bb410cfd2d324f10f4..14a782c37b050d2732028bdd70d4260de4b6a29f 100644 (file)
--- a/ext/standard/php_type.h
+++ b/ext/standard/php_type.h
@@ -30,7 +30,7 @@ PHP_FUNCTION(settype);
 PHP_FUNCTION(is_null);
 PHP_FUNCTION(is_resource);
 PHP_FUNCTION(is_bool);
-PHP_FUNCTION(is_integer);
+PHP_FUNCTION(is_int);
 PHP_FUNCTION(is_float);
 PHP_FUNCTION(is_numeric);
 PHP_FUNCTION(is_string);

diff --git a/ext/standard/type.c b/ext/standard/type.c
index c410e225f1225931e53ca4527ce9d62ac0775d08..41177f0b091fb51c043416bbb30c5880996c9673 100644 (file)
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -271,10 +271,10 @@ PHP_FUNCTION(is_bool)
 }
 /* }}} */
 
-/* {{{ proto bool is_integer(mixed var)
+/* {{{ proto bool is_int(mixed var)
    Returns true if variable is an integer
    Warning: This function is special-cased by zend_compile.c and so is usually bypassed */
-PHP_FUNCTION(is_integer)
+PHP_FUNCTION(is_int)
 {
        php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG);
 }