summaryrefslogtreecommitdiff
path: root/Zend/zend_builtin_functions.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2017-09-12 13:26:25 +0800
committerXinchen Hui <laruence@gmail.com>2017-09-12 13:26:25 +0800
commita8427e7d37cb6b2a03b48d35005373ebdad7731b (patch)
tree2f8b3044ef0824c0e8ce7c73a49e3f47f19f84ea /Zend/zend_builtin_functions.c
parent77f3cef35ced72f4aa873427ec053763ed3f3771 (diff)
parent58aa726548b18c4a48dd9804063b4eb8845aa7ef (diff)
downloadphp-git-a8427e7d37cb6b2a03b48d35005373ebdad7731b.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fixed arginfo for get_defined_functions
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r--Zend/zend_builtin_functions.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index e09310239f..d0f0b7cf69 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -193,6 +193,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
ZEND_ARG_INFO(0, exception_handler)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_functions, 0, 0, 1)
+ ZEND_ARG_INFO(0, exclude_disabled)
+ZEND_END_ARG_INFO()
+
ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2)
ZEND_ARG_INFO(0, args)
ZEND_ARG_INFO(0, code)
@@ -270,7 +274,7 @@ static const zend_function_entry builtin_functions[] = { /* {{{ */
ZEND_FE(get_declared_classes, arginfo_zend__void)
ZEND_FE(get_declared_traits, arginfo_zend__void)
ZEND_FE(get_declared_interfaces, arginfo_zend__void)
- ZEND_FE(get_defined_functions, arginfo_zend__void)
+ ZEND_FE(get_defined_functions, arginfo_get_defined_functions)
ZEND_FE(get_defined_vars, arginfo_zend__void)
ZEND_DEP_FE(create_function, arginfo_create_function)
ZEND_FE(get_resource_type, arginfo_get_resource_type)