com php-src: Improved error message: Zend/tests/bug54013.phpt Zend/tests/bug64515.phpt Zend/zend_compile.c

Commit: f3106998b0cd8edd94d8a950f2accc4c593fdf56 Author: Dmitry Stogov <dmitry@zend.com> Mon, 18 Aug 2014 21:47:30 +0400 Parents: 0f5bad93fd9eb0bb73855b536d15c6b6bacb6dbc Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f3106998b0cd8edd94d8a950f2accc4c593fdf56 Log: Improved error message Changed paths: M Zend/tests/bug54013.phpt M Zend/tests/bug64515.phpt M Zend/zend_compile.c Diff: diff --git a/Zend/tests/bug54013.phpt b/Zend/tests/bug54013.phpt index d306967..8e498a7 100644 --- a/Zend/tests/bug54013.phpt +++ b/Zend/tests/bug54013.phpt @@ -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 diff --git a/Zend/tests/bug64515.phpt b/Zend/tests/bug64515.phpt index 6330ec8..b101c17 100644 --- a/Zend/tests/bug64515.phpt +++ b/Zend/tests/bug64515.phpt @@ -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 diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ae26733..35761ec 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -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)) {