Consistency

Author: arnaud-lb

Zend/tests/partial_application/non_dynamic_call_funcs.phpt

@@ -41,6 +41,6 @@ foreach (['_func_get_arg', '_compact', '_extract', '_func_get_args', '_func_num_
 Error: Cannot call func_get_arg() dynamically
 Error: Cannot call compact() dynamically
 Error: Cannot call extract() dynamically
-ArgumentCountError: Partial application of func_get_args() expects at most 0 arguments, 1 given
-ArgumentCountError: Partial application of func_num_args() expects at most 0 arguments, 1 given
-ArgumentCountError: Partial application of get_defined_vars() expects at most 0 arguments, 1 given
+Error: Cannot call func_get_args() dynamically
+Error: Cannot call func_num_args() dynamically
+Error: Cannot call get_defined_vars() dynamically

Zend/zend_partial.c

@@ -666,10 +666,12 @@ static uint32_t zp_compute_num_required(zend_function *function,
 
 /* Functions that do not allow to be called dynamically */
 static const zend_known_string_id zp_non_dynamic_call_funcs[] = {
-	ZEND_STR_FUNC_GET_ARG,
 	ZEND_STR_COMPACT,
 	ZEND_STR_EXTRACT,
-	/* Omit nullary functions such as func_num_args(), as these can't be PFA'd*/
+	ZEND_STR_FUNC_GET_ARG,
+	ZEND_STR_FUNC_GET_ARGS,
+	ZEND_STR_FUNC_NUM_ARGS,
+	ZEND_STR_GET_DEFINED_VARS,
 };
 
 static bool zp_is_non_dynamic_call_func(zend_function *function)

Zend/zend_string.h

@@ -638,6 +638,7 @@ EMPTY_SWITCH_DEFAULT_CASE()
 	_(ZEND_STR_ASSERT,                 "assert") \
 	_(ZEND_STR_CALL_USER_FUNC,         "call_user_func") \
 	_(ZEND_STR_ARRAY_SLICE,            "array_slice") \
+	_(ZEND_STR_GET_DEFINED_VARS,       "get_defined_vars") \
 	_(ZEND_STR_SENSITIVEPARAMETER,     "SensitiveParameter") \
 	_(ZEND_STR_CONST_EXPR_PLACEHOLDER, "[constant expression]") \
 	_(ZEND_STR_DEPRECATED_CAPITALIZED, "Deprecated") \