From 6b8ed592b92027ceb4f76e6a06754a9c75ca4f36 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sun, 14 Dec 2014 22:26:16 +0100
Subject: [PATCH] =?utf8?q?Change=20back=20to=20use=20is=5Fint()=20as=20fun?=
=?utf8?q?ction=20instead=20of=20is=5Finteger(),=20as=20per=20Jan=20Tvrd?=
=?utf8?q?=C3=ADk's=20request=20@github?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
ext/standard/basic_functions.c | 8 ++++----
ext/standard/php_type.h | 2 +-
ext/standard/type.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index fbccd5d4d2..479ac7b8a2 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_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 9ecfcd6d15..14a782c37b 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_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 c410e225f1..41177f0b09 100644
--- 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);
}
--
2.40.0