From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 18 Aug 2014 17:47:30 +0000 (+0400)
Subject: Improved error message
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~45^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3106998b0cd8edd94d8a950f2accc4c593fdf56;p=php

Improved error message
---

diff --git a/Zend/tests/bug54013.phpt b/Zend/tests/bug54013.phpt
index d3069678b4..8e498a7f51 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 6330ec8096..b101c17c3a 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 ae26733a7b..35761ecec0 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)) {