From 840e441d2dabfa43149d5df7c1f32df8077c30c4 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 29 Jul 2021 12:46:55 +0200 Subject: [PATCH] Fix parameter name in call_user_func() error message This parameter name has been changed to $callback. --- Zend/tests/bug45186.phpt | 2 +- Zend/tests/bug45186_2.phpt | 4 ++-- Zend/tests/bug48770_2.phpt | 4 ++-- Zend/tests/bug48770_3.phpt | 2 +- Zend/tests/call_user_func_002.phpt | 8 ++++---- Zend/tests/methods-on-non-objects-call-user-func.phpt | 2 +- Zend/tests/nullsafe_operator/013.phpt | 2 +- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 6 +++--- ext/standard/tests/general_functions/callbacks_001.phpt | 2 +- ext/standard/tests/general_functions/callbacks_002.phpt | 6 +++--- tests/classes/abstract_user_call.phpt | 2 +- tests/classes/autoload_012.phpt | 2 +- tests/classes/bug27504.phpt | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Zend/tests/bug45186.phpt b/Zend/tests/bug45186.phpt index 1a18e380046..46ec78ee1b4 100644 --- a/Zend/tests/bug45186.phpt +++ b/Zend/tests/bug45186.phpt @@ -54,4 +54,4 @@ string(1) "y" ok __callstatic: string(3) "www" -call_user_func(): Argument #1 ($function) must be a valid callback, cannot access "self" when no class scope is active +call_user_func(): Argument #1 ($callback) must be a valid callback, cannot access "self" when no class scope is active diff --git a/Zend/tests/bug45186_2.phpt b/Zend/tests/bug45186_2.phpt index 960c38196eb..18a0799716b 100644 --- a/Zend/tests/bug45186_2.phpt +++ b/Zend/tests/bug45186_2.phpt @@ -52,5 +52,5 @@ string(1) "y" __call: string(1) "y" ok -call_user_func(): Argument #1 ($function) must be a valid callback, class bar does not have a method "www" -call_user_func(): Argument #1 ($function) must be a valid callback, cannot access "self" when no class scope is active +call_user_func(): Argument #1 ($callback) must be a valid callback, class bar does not have a method "www" +call_user_func(): Argument #1 ($callback) must be a valid callback, cannot access "self" when no class scope is active diff --git a/Zend/tests/bug48770_2.phpt b/Zend/tests/bug48770_2.phpt index de975e37a1f..9ba6776a5a0 100644 --- a/Zend/tests/bug48770_2.phpt +++ b/Zend/tests/bug48770_2.phpt @@ -56,5 +56,5 @@ $c->func('This should work!'); --EXPECT-- string(27) "B::func2: This should work!" string(27) "B::func3: This should work!" -call_user_func_array(): Argument #1 ($function) must be a valid callback, cannot access private method B::func22() -call_user_func_array(): Argument #1 ($function) must be a valid callback, class B does not have a method "inexistent" +call_user_func_array(): Argument #1 ($callback) must be a valid callback, cannot access private method B::func22() +call_user_func_array(): Argument #1 ($callback) must be a valid callback, class B does not have a method "inexistent" diff --git a/Zend/tests/bug48770_3.phpt b/Zend/tests/bug48770_3.phpt index 0918755b72c..8e5d6033572 100644 --- a/Zend/tests/bug48770_3.phpt +++ b/Zend/tests/bug48770_3.phpt @@ -47,4 +47,4 @@ $c->func('This should work!'); --EXPECT-- string(27) "B::func2: This should work!" string(27) "B::func3: This should work!" -call_user_func_array(): Argument #1 ($function) must be a valid callback, class C does not have a method "inexistent" +call_user_func_array(): Argument #1 ($callback) must be a valid callback, class C does not have a method "inexistent" diff --git a/Zend/tests/call_user_func_002.phpt b/Zend/tests/call_user_func_002.phpt index 4f2d97182e8..443334cd237 100644 --- a/Zend/tests/call_user_func_002.phpt +++ b/Zend/tests/call_user_func_002.phpt @@ -31,11 +31,11 @@ try { ?> --EXPECTF-- string(3) "foo" -call_user_func(): Argument #1 ($function) must be a valid callback, class "foo" not found -call_user_func(): Argument #1 ($function) must be a valid callback, class "" not found +call_user_func(): Argument #1 ($callback) must be a valid callback, class "foo" not found +call_user_func(): Argument #1 ($callback) must be a valid callback, class "" not found Warning: Undefined variable $foo in %s on line %d -call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object Warning: Undefined variable $foo in %s on line %d -call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object diff --git a/Zend/tests/methods-on-non-objects-call-user-func.phpt b/Zend/tests/methods-on-non-objects-call-user-func.phpt index c158cd1ca12..7a8ab5a2647 100644 --- a/Zend/tests/methods-on-non-objects-call-user-func.phpt +++ b/Zend/tests/methods-on-non-objects-call-user-func.phpt @@ -10,4 +10,4 @@ try { } ?> --EXPECT-- -call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object diff --git a/Zend/tests/nullsafe_operator/013.phpt b/Zend/tests/nullsafe_operator/013.phpt index fd1fbc9006f..14a45654127 100644 --- a/Zend/tests/nullsafe_operator/013.phpt +++ b/Zend/tests/nullsafe_operator/013.phpt @@ -47,7 +47,7 @@ bool(false) bool(false) string(1) "%s" int(0) -string(98) "call_user_func_array(): Argument #1 ($function) must be a valid callback, no array or string given" +string(98) "call_user_func_array(): Argument #1 ($callback) must be a valid callback, no array or string given" string(77) "call_user_func_array(): Argument #2 ($args) must be of type array, null given" string(69) "get_class(): Argument #1 ($object) must be of type object, null given" string(55) "get_called_class() expects exactly 0 arguments, 1 given" diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 41a4b481fe4..7b2ee713834 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3787,7 +3787,7 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM) init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($callback) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); FREE_OP2(); HANDLE_EXCEPTION(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 906f0df6f13..c31b6880532 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -6720,7 +6720,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CONS init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($callback) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); HANDLE_EXCEPTION(); @@ -9011,7 +9011,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_TMPV init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($callback) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); zval_ptr_dtor_nogc(EX_VAR(opline->op2.var)); HANDLE_EXCEPTION(); @@ -11393,7 +11393,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H init_func_run_time_cache(&func->op_array); } } else { - zend_type_error("%s(): Argument #1 ($function) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); + zend_type_error("%s(): Argument #1 ($callback) must be a valid callback, %s", Z_STRVAL_P(RT_CONSTANT(opline, opline->op1)), error); efree(error); HANDLE_EXCEPTION(); diff --git a/ext/standard/tests/general_functions/callbacks_001.phpt b/ext/standard/tests/general_functions/callbacks_001.phpt index a1c5b4cdec5..53e7dd914de 100644 --- a/ext/standard/tests/general_functions/callbacks_001.phpt +++ b/ext/standard/tests/general_functions/callbacks_001.phpt @@ -106,4 +106,4 @@ O $this|O::who O $this|B::who -call_user_func(): Argument #1 ($function) must be a valid callback, class P is not a subclass of B +call_user_func(): Argument #1 ($callback) must be a valid callback, class P is not a subclass of B diff --git a/ext/standard/tests/general_functions/callbacks_002.phpt b/ext/standard/tests/general_functions/callbacks_002.phpt index 220896df675..11d8d9a690e 100644 --- a/ext/standard/tests/general_functions/callbacks_002.phpt +++ b/ext/standard/tests/general_functions/callbacks_002.phpt @@ -21,6 +21,6 @@ try { ?> --EXPECT-- -call_user_func(): Argument #1 ($function) must be a valid callback, class "Foo" not found -call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object -call_user_func(): Argument #1 ($function) must be a valid callback, second array member is not a valid method +call_user_func(): Argument #1 ($callback) must be a valid callback, class "Foo" not found +call_user_func(): Argument #1 ($callback) must be a valid callback, first array member is not a valid class name or object +call_user_func(): Argument #1 ($callback) must be a valid callback, second array member is not a valid method diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt index cd8c5c7e362..f331cb8226e 100644 --- a/tests/classes/abstract_user_call.phpt +++ b/tests/classes/abstract_user_call.phpt @@ -29,4 +29,4 @@ try { ?> --EXPECT-- test::func() -call_user_func(): Argument #1 ($function) must be a valid callback, cannot call abstract method test_base::func() +call_user_func(): Argument #1 ($callback) must be a valid callback, cannot call abstract method test_base::func() diff --git a/tests/classes/autoload_012.phpt b/tests/classes/autoload_012.phpt index c8dc35b6f1a..0f00ebf562f 100644 --- a/tests/classes/autoload_012.phpt +++ b/tests/classes/autoload_012.phpt @@ -14,4 +14,4 @@ try { ?> --EXPECT-- In autoload: string(6) "UndefC" -call_user_func(): Argument #1 ($function) must be a valid callback, class "UndefC" not found +call_user_func(): Argument #1 ($callback) must be a valid callback, class "UndefC" not found diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt index b6df46920ad..d32a0c8b3f2 100644 --- a/tests/classes/bug27504.phpt +++ b/tests/classes/bug27504.phpt @@ -27,5 +27,5 @@ try { ?> --EXPECT-- Called function foo:bar(1) -call_user_func_array(): Argument #1 ($function) must be a valid callback, cannot access private method foo::bar() +call_user_func_array(): Argument #1 ($callback) must be a valid callback, cannot access private method foo::bar() Call to private method foo::bar() from global scope