php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved error message

Browse Source
This commit is contained in:
Dmitry Stogov
2014-08-18 21:47:30 +04:00
parent 0f5bad93fd
commit f3106998b0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/tests/bug54013.phpt
+1 -1
View File
@@ -21,4 +21,4 @@ var_dump($params[0], $params[1]);
?>
--EXPECTF--
Fatal error: Redefinition of parameter aaaaaaaa in %sbug54013.php on line 5
Fatal error: Redefinition of parameter $aaaaaaaa in %sbug54013.php on line 5
Zend/tests/bug64515.phpt
+1 -1
View File
@@ -9,4 +9,4 @@ foo();
echo "okey";
?>
--EXPECTF--
Fatal error: Redefinition of parameter unused in %sbug64515.php on line 2
Fatal error: Redefinition of parameter $unused in %sbug64515.php on line 2
Zend/zend_compile.c
+1 -1
View File
@@ -1845,7 +1845,7 @@ void zend_do_receive_param(zend_uchar op, znode *varname, znode *initialization,
Z_STR(varname->u.constant) = CG(active_op_array)->vars[EX_VAR_TO_NUM(var.u.op.var)];
var.EA = 0;
if (EX_VAR_TO_NUM(var.u.op.var) != CG(active_op_array)->num_args) {
zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter %s", Z_STRVAL(varname->u.constant));
zend_error_noreturn(E_COMPILE_ERROR, "Redefinition of parameter $%s", Z_STRVAL(varname->u.constant));
} else if (Z_STRHASH(varname->u.constant) == THIS_HASHVAL &&
Z_STRLEN(varname->u.constant) == sizeof("this")-1 &&
!memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")-1)) {