summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2014-12-14 21:57:07 +0100
committerKalle Sommer Nielsen <kalle@php.net>2014-12-14 21:57:07 +0100
commit04c11f918abcf56b2f0c0d942f20e0e5da76f420 (patch)
treefcfcfd1fd87ef7196012b7a28f3333e319da26cf
parent627b350f31be83eb1d5ac5fad692256dcfaf1281 (diff)
downloadphp-git-04c11f918abcf56b2f0c0d942f20e0e5da76f420.tar.gz
Change is_long() to be an alias of is_integer()
@@ See internals: news.php.net/php.internals/79639 @@ Manual will be updated so that is_int() will be an alias of is_integer() @@ I picked integer over int for consitentcy as we do not use str instead of string either
-rw-r--r--ext/standard/basic_functions.c8
-rw-r--r--ext/standard/php_type.h2
-rw-r--r--ext/standard/type.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 9ffe0fe14e..fbccd5d4d2 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_integer, 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_integer, arginfo_is_integer)
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_int, is_integer, arginfo_is_integer)
+ PHP_FALIAS(is_long, is_integer, arginfo_is_integer)
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 e6d8152b1b..9ecfcd6d15 100644
--- 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_long);
+PHP_FUNCTION(is_integer);
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 a773e6c53c..c410e225f1 100644
--- a/ext/standard/type.c
+++ b/ext/standard/type.c
@@ -271,10 +271,10 @@ PHP_FUNCTION(is_bool)
}
/* }}} */
-/* {{{ proto bool is_long(mixed var)
- Returns true if variable is a long (integer)
+/* {{{ proto bool is_integer(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_long)
+PHP_FUNCTION(is_integer)
{
php_is_type(INTERNAL_FUNCTION_PARAM_PASSTHRU, IS_LONG);
}