archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make argument type error message consistent for variadics

Browse source 
If an argument error refers to a variadic argument, we normally
do not print the name of the variadic (as it is not referring to
an individual argument, but to the collection of all of them).
However, this was not the case for the userland argument type
error message, which did it's own formatting.

Closes GH-6101.
This commit is contained in:
Nikita Popov 2020-09-09 11:42:32 +02:00
parent a79008bd91
commit b7fe1b66d0
5 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/tests/arrow_functions/006.phpt
View file

@ -41,4 +41,4 @@ array(3) {
[2]=> [2]=>
int(30) int(30)
} }
{closure}(): Argument #2 ($args) must be of type ?int, string given, called in %s on line %d {closure}(): Argument #2 must be of type ?int, string given, called in %s on line %d

4
Zend/tests/function_arguments/variadic_argument_type_error.phpt
View file

@ -19,5 +19,5 @@ try {
?> ?>
--EXPECTF-- --EXPECTF--
foo(): Argument #2 ($bar) must be of type int, array given, called in %s on line %d foo(): Argument #2 must be of type int, array given, called in %s on line %d
foo(): Argument #4 ($bar) must be of type int, array given, called in %s on line %d foo(): Argument #4 must be of type int, array given, called in %s on line %d

2
Zend/tests/variadic/typehint_error.phpt
View file

@ -33,7 +33,7 @@ array(3) {
} }
} }
Fatal error: Uncaught TypeError: test(): Argument #3 ($args) must be of type array, int given, called in %s:%d Fatal error: Uncaught TypeError: test(): Argument #3 must be of type array, int given, called in %s:%d
Stack trace: Stack trace:
#0 %s(%d): test(Array, Array, 2) #0 %s(%d): test(Array, Array, 2)
#1 {main} #1 {main}

2
Zend/tests/variadic/typehint_suppressed_error.phpt
View file

@ -15,4 +15,4 @@ try {
?> ?>
--EXPECTF-- --EXPECTF--
string(%d) "test(): Argument #3 ($args) must be of type array, int given, called in %s on line %d" string(%d) "test(): Argument #3 must be of type array, int given, called in %s on line %d"

25
Zend/zend_execute.c
View file

@ -701,23 +701,16 @@ ZEND_API ZEND_COLD void zend_verify_arg_error(
zend_verify_type_error_common( zend_verify_type_error_common(
zf, arg_info, value, &fname, &fsep, &fclass, &need_msg, &given_msg); zf, arg_info, value, &fname, &fsep, &fclass, &need_msg, &given_msg);
if (zf->common.type == ZEND_USER_FUNCTION) { ZEND_ASSERT(zf->common.type == ZEND_USER_FUNCTION
if (ptr && ptr->func && ZEND_USER_CODE(ptr->func->common.type)) { && "Arginfo verification is not performed for internal functions");
zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given, called in %s on line %d", if (ptr && ptr->func && ZEND_USER_CODE(ptr->func->common.type)) {
fclass, fsep, fname, zend_argument_type_error(arg_num, "must be of type %s, %s given, called in %s on line %d",
arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg,
ZSTR_VAL(need_msg), given_msg, ZSTR_VAL(ptr->func->op_array.filename), ptr->opline->lineno
ZSTR_VAL(ptr->func->op_array.filename), ptr->opline->lineno
);
} else {
zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given",
fclass, fsep, fname, arg_num, ZSTR_VAL(arg_info->name), ZSTR_VAL(need_msg), given_msg
);
}
} else {
zend_type_error("%s%s%s(): Argument #%d ($%s) must be of type %s, %s given",
fclass, fsep, fname, arg_num, ((zend_internal_arg_info*) arg_info)->name, ZSTR_VAL(need_msg), given_msg
); );
} else {
zend_argument_type_error(arg_num,
"must be of type %s, %s given", ZSTR_VAL(need_msg), given_msg);
} }
zend_string_release(need_msg); zend_string_release(need_msg);