From: Xinchen Hui Date: Tue, 12 Sep 2017 05:26:25 +0000 (+0800) Subject: Merge branch 'PHP-7.1' into PHP-7.2 X-Git-Tag: php-7.2.0RC2~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8427e7d37cb6b2a03b48d35005373ebdad7731b;p=php Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Fixed arginfo for get_defined_functions --- a8427e7d37cb6b2a03b48d35005373ebdad7731b diff --cc Zend/zend_builtin_functions.c index e09310239f,e4af0b3a47..d0f0b7cf69 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@@ -270,9 -370,9 +274,9 @@@ static const zend_function_entry builti 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_FE(create_function, arginfo_create_function) + ZEND_DEP_FE(create_function, arginfo_create_function) ZEND_FE(get_resource_type, arginfo_get_resource_type) ZEND_FE(get_resources, arginfo_get_resources) ZEND_FE(get_loaded_extensions, arginfo_get_loaded_extensions)