Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed arginfo for get_defined_functions

diff --cc Zend/zend_builtin_functions.c
index e09310239f7e4fd85c24bd6f88460a1c5350d213,e4af0b3a47e69952b8477145aad89a3a94b71c69..d0f0b7cf6932b530f8a95b7c81971aba4daefb37
--- 1/Zend/zend_builtin_functions.c
--- 2/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)