Improve undefined variable error messages

Closes GH-5312

35 files changed, 102 insertions, 102 deletions

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 6178be61f2..17c7f29d9a 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2484,7 +2484,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu
 				zend_hash_update(Z_ARRVAL_P(return_value), Z_STR_P(entry), &data);
 			}
 		} else {
-			php_error_docref(NULL, E_NOTICE, "Undefined variable: %s", ZSTR_VAL(Z_STR_P(entry)));
+			php_error_docref(NULL, E_NOTICE, "Undefined variable $%s", ZSTR_VAL(Z_STR_P(entry)));
 		}
 	} else if (Z_TYPE_P(entry) == IS_ARRAY) {
 	    if (Z_REFCOUNTED_P(entry)) {
diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt
index 9edc4e4a9c..d40e600c7e 100644
--- a/ext/standard/tests/array/array_fill_keys_variation4.phpt
+++ b/ext/standard/tests/array/array_fill_keys_variation4.phpt
@@ -83,7 +83,7 @@ array(1) {
 
 -- Testing array_fill_keys() function with unset var --
 
-Warning: Undefined variable: unset_var in %s on line %d
+Warning: Undefined variable $unset_var in %s on line %d
 array(1) {
   ["one"]=>
   NULL
diff --git a/ext/standard/tests/array/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt
index e0309bac1f..05546f3d1d 100644
--- a/ext/standard/tests/array/bug30074.phpt
+++ b/ext/standard/tests/array/bug30074.phpt
@@ -7,7 +7,7 @@ var_dump(array($a));
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: Undefined variable: undefined in %s on line %d
+Warning: Undefined variable $undefined in %s on line %d
 array(1) {
   [0]=>
   NULL
diff --git a/ext/standard/tests/array/bug31158.phpt b/ext/standard/tests/array/bug31158.phpt
index d4f5210760..02d74875d3 100644
--- a/ext/standard/tests/array/bug31158.phpt
+++ b/ext/standard/tests/array/bug31158.phpt
@@ -14,7 +14,7 @@ __();
 echo "ok\n";
 ?>
 --EXPECTF--
-Warning: Undefined variable: GLOBALS in %s on line %d
+Warning: Undefined variable $GLOBALS in %s on line %d
 
 Warning: Trying to access array offset on value of type null in %s on line %d
 ok
diff --git a/ext/standard/tests/array/bug69198.phpt b/ext/standard/tests/array/bug69198.phpt
index 3441bee5d7..1231c44c93 100644
--- a/ext/standard/tests/array/bug69198.phpt
+++ b/ext/standard/tests/array/bug69198.phpt
@@ -9,7 +9,7 @@ $result = compact('willNeverBeDefined');
 var_dump($result, empty($result), $result === array(), empty($willNeverBeDefined));
 ?>
 --EXPECTF--
-Notice: compact(): Undefined variable: willNeverBeDefined in %s on line %d
+Notice: compact(): Undefined variable $willNeverBeDefined in %s on line %d
 array(0) {
 }
 bool(true)
diff --git a/ext/standard/tests/array/compact.phpt b/ext/standard/tests/array/compact.phpt
index d18f3d83e9..8c3ee9a160 100644
--- a/ext/standard/tests/array/compact.phpt
+++ b/ext/standard/tests/array/compact.phpt
@@ -13,7 +13,7 @@ $result = compact("event", $location_vars);
 var_dump($result);
 ?>
 --EXPECTF--
-Notice: compact(): Undefined variable: c\u0327ity in %s on line %d
+Notice: compact(): Undefined variable $c\u0327ity in %s on line %d
 array(2) {
   ["event"]=>
   string(8) "SIGGRAPH"
diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt
index c71215fe1b..adeae03a7b 100644
--- a/ext/standard/tests/array/compact_basic.phpt
+++ b/ext/standard/tests/array/compact_basic.phpt
@@ -81,7 +81,7 @@ array(0) {
 array(0) {
 }
 
-Notice: compact(): Undefined variable: g in %s on line %d
+Notice: compact(): Undefined variable $g in %s on line %d
 array(0) {
 }
 Done
diff --git a/ext/standard/tests/array/compact_variation2.phpt b/ext/standard/tests/array/compact_variation2.phpt
index fb186ae002..7ee9c7d0d2 100644
--- a/ext/standard/tests/array/compact_variation2.phpt
+++ b/ext/standard/tests/array/compact_variation2.phpt
@@ -25,7 +25,7 @@ f();
 --EXPECTF--
 *** Testing compact() : usage variations  - variables outside of current scope ***
 
-Notice: compact(): Undefined variable: a in %s on line %d
+Notice: compact(): Undefined variable $a in %s on line %d
 array(2) {
   ["b"]=>
   string(3) "f.b"
@@ -33,7 +33,7 @@ array(2) {
   string(3) "f.c"
 }
 
-Notice: compact(): Undefined variable: a in %s on line %d
+Notice: compact(): Undefined variable $a in %s on line %d
 array(2) {
   ["b"]=>
   string(3) "f.b"
diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt
index 2fc98396b1..bae4a470f2 100644
--- a/ext/standard/tests/array/sizeof_variation4.phpt
+++ b/ext/standard/tests/array/sizeof_variation4.phpt
@@ -89,380 +89,380 @@ echo "Done";
 --- Testing sizeof() for all kinds of unset variables in default, Normal and Recursive Modes ---
 -- Iteration 1 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 2 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 3 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 4 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 5 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 6 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 7 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 8 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 9 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 10 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 11 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 12 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 13 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 14 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 15 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 16 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 17 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 18 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 19 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 -- Iteration 20 --
 Default Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_NORMAL Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
 
 COUNT_RECURSIVE Mode: 
-Warning: Undefined variable: value in %s on line %d
+Warning: Undefined variable $value in %s on line %d
 
 Warning: sizeof(): Parameter must be an array or an object that implements Countable in %s on line %d
 int(0)
diff --git a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt
index e44a3d1fd9..5c2df9785b 100644
--- a/ext/standard/tests/class_object/get_class_methods_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_methods_variation_001.phpt
@@ -83,8 +83,8 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing get_class_methods() : usage variations ***
-Error: 2 - Undefined variable: undefined_var
-Error: 2 - Undefined variable: unset_var
+Error: 2 - Undefined variable $undefined_var
+Error: 2 - Undefined variable $unset_var
 
 Arg value 0 
 NULL
diff --git a/ext/standard/tests/class_object/get_class_variation_001.phpt b/ext/standard/tests/class_object/get_class_variation_001.phpt
index 985a468680..a4f20cd807 100644
--- a/ext/standard/tests/class_object/get_class_variation_001.phpt
+++ b/ext/standard/tests/class_object/get_class_variation_001.phpt
@@ -80,9 +80,9 @@ echo "Done";
 --EXPECTF--
 *** Testing get_class() : usage variations ***
 
-Warning: Undefined variable: undefined_var in %s on line %d
+Warning: Undefined variable $undefined_var in %s on line %d
 
-Warning: Undefined variable: unset_var in %s on line %d
+Warning: Undefined variable $unset_var in %s on line %d
 
 Arg value: 0 (type: integer)
 get_class(): Argument #1 ($object) must be of type object, int given
diff --git a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
index d564ad3cd0..c2b9694746 100644
--- a/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
+++ b/ext/standard/tests/class_object/get_parent_class_variation_002.phpt
@@ -85,8 +85,8 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing get_parent_class() : usage variations ***
-Error: 2 - Undefined variable: undefined_var
-Error: 2 - Undefined variable: unset_var
+Error: 2 - Undefined variable $undefined_var
+Error: 2 - Undefined variable $unset_var
 
 Arg value 0 
 bool(false)
diff --git a/ext/standard/tests/class_object/is_a_variation_001.phpt b/ext/standard/tests/class_object/is_a_variation_001.phpt
index e9dfe0db6d..406d09c1f2 100644
--- a/ext/standard/tests/class_object/is_a_variation_001.phpt
+++ b/ext/standard/tests/class_object/is_a_variation_001.phpt
@@ -77,9 +77,9 @@ echo "Done";
 --EXPECTF--
 *** Testing is_a() : usage variations ***
 
-Warning: Undefined variable: undefined_var in %s on line %d
+Warning: Undefined variable $undefined_var in %s on line %d
 
-Warning: Undefined variable: unset_var in %s on line %d
+Warning: Undefined variable $unset_var in %s on line %d
 
 Arg value 0 
 bool(false)
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
index 37743f393e..40af5d4468 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_001.phpt
@@ -86,8 +86,8 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing is_subclass_of() : usage variations ***
-Error: 2 - Undefined variable: undefined_var
-Error: 2 - Undefined variable: unset_var
+Error: 2 - Undefined variable $undefined_var
+Error: 2 - Undefined variable $unset_var
 
 Arg value 0 
 bool(false)
diff --git a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
index c9409dcac8..eeec54af0d 100644
--- a/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
+++ b/ext/standard/tests/class_object/is_subclass_of_variation_004.phpt
@@ -86,8 +86,8 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing is_subclass_of() : usage variations ***
-Error: 2 - Undefined variable: undefined_var
-Error: 2 - Undefined variable: unset_var
+Error: 2 - Undefined variable $undefined_var
+Error: 2 - Undefined variable $unset_var
 
 Arg value 0 
 bool(false)
diff --git a/ext/standard/tests/class_object/method_exists_variation_001.phpt b/ext/standard/tests/class_object/method_exists_variation_001.phpt
index 0f2293cf7b..3ad49456c6 100644
--- a/ext/standard/tests/class_object/method_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt
@@ -85,8 +85,8 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing method_exists() : usage variations ***
-Error: 2 - Undefined variable: undefined_var
-Error: 2 - Undefined variable: unset_var
+Error: 2 - Undefined variable $undefined_var
+Error: 2 - Undefined variable $unset_var
 
 Arg value 0 
 bool(false)
diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt
index 9e4f07f0b5..d60ade5716 100644
--- a/ext/standard/tests/file/fscanf_error.phpt
+++ b/ext/standard/tests/file/fscanf_error.phpt
@@ -67,7 +67,7 @@ unlink($filename);
 fscanf(): supplied resource is not a valid File-Handle resource
 Different numbers of variable names and field specifiers
 
-Warning: Undefined variable: undefined_var in %s on line %d
+Warning: Undefined variable $undefined_var in %s on line %d
 array(0) {
 }
 Bad scan conversion character "
diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt
index 799a264e34..f6a13e6534 100644
--- a/ext/standard/tests/file/pathinfo_variaton.phpt
+++ b/ext/standard/tests/file/pathinfo_variaton.phpt
@@ -90,7 +90,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing pathinfo() with miscellaneous input arguments ***
 
-Warning: Undefined variable: fp in %s on line %d
+Warning: Undefined variable $fp in %s on line %d
 -- Iteration 1 --
 array(3) {
   ["dirname"]=>
diff --git a/ext/standard/tests/general_functions/bug32647.phpt b/ext/standard/tests/general_functions/bug32647.phpt
index 4f5697a0d4..ff7bf9f056 100644
--- a/ext/standard/tests/general_functions/bug32647.phpt
+++ b/ext/standard/tests/general_functions/bug32647.phpt
@@ -30,11 +30,11 @@ register_shutdown_function(array($obj,'barfoo'));      // Valid
 
 ?>
 --EXPECTF--
-Warning: Undefined variable: obj in %s on line %d
+Warning: Undefined variable $obj in %s on line %d
 
 Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed in %s on line %d
 
-Warning: Undefined variable: obj in %s on line %d
+Warning: Undefined variable $obj in %s on line %d
 
 Warning: register_shutdown_function(): Invalid shutdown callback 'Array' passed in %s on line %d
 
diff --git a/ext/standard/tests/general_functions/bug60723.phpt b/ext/standard/tests/general_functions/bug60723.phpt
index 93381d246c..fff1b78790 100644
--- a/ext/standard/tests/general_functions/bug60723.phpt
+++ b/ext/standard/tests/general_functions/bug60723.phpt
@@ -14,6 +14,6 @@ readfile($log);
 unlink($log);
 ?>
 --EXPECTF--
-Warning: Undefined variable: aa in %s on line %d
-[%s ASIA/Chongqing] PHP Warning:  Undefined variable: aa in %s on line %d
+Warning: Undefined variable $aa in %s on line %d
+[%s ASIA/Chongqing] PHP Warning:  Undefined variable $aa in %s on line %d
 [%s ASIA/Chongqing] dummy
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
index 1b0a919e03..b893d80246 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
@@ -147,7 +147,7 @@ int(10)
 
 -- Value of $ref_first_var --
 
-Warning: Undefined variable: ref_first_var in %s on line %d
+Warning: Undefined variable $ref_first_var in %s on line %d
 NULL
 
 -- Value of $first_var --
@@ -166,7 +166,7 @@ int(10)
 
 -- Value of $var_3: (after unsetting var_3) --
 
-Warning: Undefined variable: var_3 in %s on line %d
+Warning: Undefined variable $var_3 in %s on line %d
 NULL
 
 -- Value of $var_2: --
@@ -177,7 +177,7 @@ int(10)
 
 -- Value of $var_1: (after unsetting variable_1) --
 
-Warning: Undefined variable: var_1 in %s on line %d
+Warning: Undefined variable $var_1 in %s on line %d
 NULL
 
 -- Value of $var_2: --
diff --git a/ext/standard/tests/general_functions/error_clear_last.phpt b/ext/standard/tests/general_functions/error_clear_last.phpt
index 2cfd17793a..88a59d949a 100644
--- a/ext/standard/tests/general_functions/error_clear_last.phpt
+++ b/ext/standard/tests/general_functions/error_clear_last.phpt
@@ -22,7 +22,7 @@ array(4) {
   ["type"]=>
   int(2)
   ["message"]=>
-  string(21) "Undefined variable: b"
+  string(21) "Undefined variable $b"
   ["file"]=>
   string(%d) "%s"
   ["line"]=>
diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt
index a4cae412b5..9bdefc334b 100644
--- a/ext/standard/tests/general_functions/error_get_last.phpt
+++ b/ext/standard/tests/general_functions/error_get_last.phpt
@@ -22,12 +22,12 @@ NULL
 error_get_last() expects exactly 0 parameters, 1 given
 NULL
 
-Warning: Undefined variable: b in %s on line %d
+Warning: Undefined variable $b in %s on line %d
 array(4) {
   ["type"]=>
   int(2)
   ["message"]=>
-  string(21) "Undefined variable: b"
+  string(21) "Undefined variable $b"
   ["file"]=>
   string(%d) "%s"
   ["line"]=>
diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt
index 7799303c62..50cc3c0561 100644
--- a/ext/standard/tests/image/getimagesize_variation2.phpt
+++ b/ext/standard/tests/image/getimagesize_variation2.phpt
@@ -80,8 +80,8 @@ foreach($values as $key => $value) {
 ?>
 --EXPECT--
 *** Testing getimagesize() : usage variations ***
-Error: 2 - Undefined variable: undefined_var
-Error: 2 - Undefined variable: unset_var
+Error: 2 - Undefined variable $undefined_var
+Error: 2 - Undefined variable $unset_var
 
 -- Arg value 0 --
 string(28) "4a46494600010201006000600000"
diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt
index fd71292e89..369087b3ce 100644
--- a/ext/standard/tests/serialize/serialization_objects_002.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_002.phpt
diff --git a/ext/standard/tests/strings/crc32_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt
index bc219c43e9..44ab68d1ed 100644
--- a/ext/standard/tests/strings/crc32_variation3.phpt
+++ b/ext/standard/tests/strings/crc32_variation3.phpt
@@ -77,9 +77,9 @@ echo "Done";
 --EXPECTF--
 *** Testing crc32() : with different strings in double quotes ***
 
-Warning: Undefined variable: hello in %s on line %d
+Warning: Undefined variable $hello in %s on line %d
 
-Warning: Undefined variable: world in %s on line %d
+Warning: Undefined variable $world in %s on line %d
 
 -- Iteration 1 --
 int(0)
diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt
index 5f754d7b2b..359d210e74 100644
--- a/ext/standard/tests/strings/lcfirst.phpt
+++ b/ext/standard/tests/strings/lcfirst.phpt
diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt
index 2245ca422c..fba241924f 100644
--- a/ext/standard/tests/strings/str_replace_variation3.phpt
+++ b/ext/standard/tests/strings/str_replace_variation3.phpt
@@ -223,7 +223,7 @@ int(0)
 string(5) "FOUND"
 string(5) "FOUND"
 
-Warning: Undefined variable: strS in %s on line %d
+Warning: Undefined variable $strS in %s on line %d
 string(0) ""
 string(5) "FOUND"
 string(5) "FOUND"
diff --git a/ext/standard/tests/strings/str_word_count1.phpt b/ext/standard/tests/strings/str_word_count1.phpt
index ad00c1480f..c4f8ecf40a 100644
--- a/ext/standard/tests/strings/str_word_count1.phpt
+++ b/ext/standard/tests/strings/str_word_count1.phpt
@@ -23,8 +23,8 @@ var_dump($a);
 int(0)
 str_word_count(): Argument #2 ($format) must be a valid format value
 
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
 str_word_count(): Argument #2 ($format) must be a valid format value
 
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
 NULL
diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt
index 4258f11ee3..95a25bd699 100644
--- a/ext/standard/tests/strings/strcasecmp.phpt
+++ b/ext/standard/tests/strings/strcasecmp.phpt
diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt
index d4110601af..824d7ed101 100644
--- a/ext/standard/tests/strings/strcmp.phpt
+++ b/ext/standard/tests/strings/strcmp.phpt
diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt
index 282db2da2d..468dd9acfe 100644
--- a/ext/standard/tests/strings/strlen.phpt
+++ b/ext/standard/tests/strings/strlen.phpt
diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt
index 7617536346..2d44cd9212 100644
--- a/ext/standard/tests/strings/strpos.phpt
+++ b/ext/standard/tests/strings/strpos.phpt
diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt
index 796a3476e9..46f411f876 100644
--- a/ext/standard/tests/strings/strstr.phpt
+++ b/ext/standard/tests/strings/strstr.phpt
diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt
index 48fd772a04..a54b984b88 100644
--- a/ext/standard/tests/strings/ucfirst.phpt
+++ b/ext/standard/tests/strings/ucfirst.phpt