summaryrefslogtreecommitdiff
path: root/Zend/tests
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2020-03-30 17:23:03 +0200
committerMáté Kocsis <kocsismate@woohoolabs.com>2020-03-31 13:02:32 +0200
commit36935e42eac054a422b7edade69923db7727f268 (patch)
treee8d08101f42f5e8ee60ed423833df08725130807 /Zend/tests
parent6bf483a94abcac24a3f1fc09feed2c6fbf5d648f (diff)
downloadphp-git-36935e42eac054a422b7edade69923db7727f268.tar.gz
Improve undefined variable error messages
Closes GH-5312
Diffstat (limited to 'Zend/tests')
-rw-r--r--Zend/tests/019.phpt216
-rw-r--r--Zend/tests/024.phpt18
-rw-r--r--Zend/tests/033.phpt6
-rw-r--r--Zend/tests/array_unpack/undef_var.phpt2
-rw-r--r--Zend/tests/arrow_functions/002.phpt2
-rw-r--r--Zend/tests/arrow_functions/003.phpt4
-rw-r--r--Zend/tests/bug29896.phpt2
-rw-r--r--Zend/tests/bug30162.phpt2
-rw-r--r--Zend/tests/bug31720.phpt2
-rw-r--r--Zend/tests/bug39036.phpt2
-rw-r--r--Zend/tests/bug41209.phpt2
-rw-r--r--Zend/tests/bug43201.phpt14
-rw-r--r--Zend/tests/bug47109.phpt2
-rw-r--r--Zend/tests/bug52001.phpt4
-rw-r--r--Zend/tests/bug52041.phpt26
-rw-r--r--Zend/tests/bug61767.phpt4
-rw-r--r--Zend/tests/bug67314.phpt4
-rw-r--r--Zend/tests/bug70124.phpt2
-rw-r--r--Zend/tests/bug72944.phpt2
-rw-r--r--Zend/tests/bug75921.phpt10
-rw-r--r--Zend/tests/bug76667.phpt6
-rw-r--r--Zend/tests/bug78531.phpt8
-rw-r--r--Zend/tests/call_user_func_002.phpt4
-rw-r--r--Zend/tests/clone_003.phpt2
-rw-r--r--Zend/tests/closure_012.phpt4
-rw-r--r--Zend/tests/closure_027.phpt2
-rw-r--r--Zend/tests/dereference_007.phpt2
-rw-r--r--Zend/tests/dynamic_call_004.phpt2
-rw-r--r--Zend/tests/entry_block_with_predecessors.phpt2
-rw-r--r--Zend/tests/errmsg_045.phpt2
-rw-r--r--Zend/tests/error_reporting03.phpt2
-rw-r--r--Zend/tests/error_reporting04.phpt2
-rw-r--r--Zend/tests/error_reporting05.phpt4
-rw-r--r--Zend/tests/error_reporting08.phpt2
-rw-r--r--Zend/tests/error_reporting09.phpt4
-rw-r--r--Zend/tests/exception_before_fatal.phpt14
-rw-r--r--Zend/tests/foreach_undefined.phpt2
-rw-r--r--Zend/tests/globals_001.phpt2
-rw-r--r--Zend/tests/globals_002.phpt2
-rw-r--r--Zend/tests/globals_003.phpt2
-rw-r--r--Zend/tests/globals_004.phpt2
-rw-r--r--Zend/tests/inference_infinite_loop.phpt2
-rw-r--r--Zend/tests/isset_003.phpt4
-rw-r--r--Zend/tests/method_argument_binding.phpt2
-rw-r--r--Zend/tests/this_in_extract.phpt2
-rw-r--r--Zend/tests/unset_cv01.phpt2
-rw-r--r--Zend/tests/unset_cv02.phpt2
-rw-r--r--Zend/tests/unset_cv03.phpt2
-rw-r--r--Zend/tests/unset_cv04.phpt2
-rw-r--r--Zend/tests/unset_cv09.phpt2
-rw-r--r--Zend/tests/unset_cv10.phpt2
51 files changed, 210 insertions, 210 deletions
diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt
index 3b3c923850..3eb085b10a 100644
--- a/Zend/tests/019.phpt
+++ b/Zend/tests/019.phpt
@@ -367,7 +367,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -379,7 +379,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -391,7 +391,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -403,7 +403,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -415,7 +415,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -427,7 +427,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -439,7 +439,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -451,7 +451,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -463,7 +463,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -475,7 +475,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -487,7 +487,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -499,7 +499,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -511,7 +511,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -523,7 +523,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -535,7 +535,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -547,7 +547,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -559,7 +559,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -571,7 +571,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -583,7 +583,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -595,7 +595,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -607,7 +607,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -619,7 +619,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -631,7 +631,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -643,7 +643,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -655,7 +655,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -667,7 +667,7 @@ bool(true)
bool(true)
bool(false)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -679,7 +679,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: scalar_var in %s on line %d
+Warning: Undefined variable $scalar_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -696,7 +696,7 @@ bool(true)
bool(true)
bool(true)
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -712,18 +712,18 @@ bool(true)
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -739,18 +739,18 @@ bool(true)
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -766,18 +766,18 @@ bool(true)
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -793,18 +793,18 @@ bool(true)
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -826,13 +826,13 @@ array(3) {
int(4)
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(3) {
[1]=>
@@ -850,13 +850,13 @@ array(2) {
int(4)
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(2) {
[2]=>
@@ -870,13 +870,13 @@ array(1) {
int(4)
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(1) {
[3]=>
@@ -886,18 +886,18 @@ array(1) {
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -917,13 +917,13 @@ array(2) {
float(5.6)
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(2) {
[1]=>
@@ -937,13 +937,13 @@ array(1) {
float(5.6)
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(1) {
[2]=>
@@ -953,18 +953,18 @@ array(1) {
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -982,13 +982,13 @@ array(1) {
string(3) "two"
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(1) {
[2]=>
@@ -998,18 +998,18 @@ array(1) {
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -1027,13 +1027,13 @@ array(1) {
string(2) "30"
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(1) {
["Age"]=>
@@ -1043,18 +1043,18 @@ array(1) {
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -1078,13 +1078,13 @@ array(4) {
string(0) ""
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(4) {
[1]=>
@@ -1106,13 +1106,13 @@ array(3) {
string(0) ""
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(3) {
["One"]=>
@@ -1130,13 +1130,13 @@ array(2) {
string(0) ""
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(2) {
[2]=>
@@ -1150,13 +1150,13 @@ array(1) {
string(0) ""
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(1) {
[""]=>
@@ -1166,18 +1166,18 @@ array(1) {
array(0) {
}
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(false)
-Warning: Undefined variable: key_val in %s on line %d
+Warning: Undefined variable $key_val in %s on line %d
bool(true)
array(0) {
}
-Warning: Undefined variable: array_var in %s on line %d
+Warning: Undefined variable $array_var in %s on line %d
NULL
bool(false)
bool(false)
@@ -1195,7 +1195,7 @@ bool(true)
bool(false)
bool(false)
-Warning: Undefined variable: resource in %s on line %d
+Warning: Undefined variable $resource in %s on line %d
NULL
-- Iteration 2 --
resource(%d) of type (stream)
@@ -1208,10 +1208,10 @@ bool(true)
bool(false)
bool(false)
-Warning: Undefined variable: resource in %s on line %d
+Warning: Undefined variable $resource in %s on line %d
NULL
-Warning: Undefined variable: resources in %s on line %d
+Warning: Undefined variable $resources in %s on line %d
NULL
bool(false)
bool(true)
@@ -1228,16 +1228,16 @@ object(Point)#%d (3) {
bool(true)
bool(false)
-Warning: Undefined variable: lable in %s on line %d
+Warning: Undefined variable $lable in %s on line %d
bool(false)
-Warning: Undefined variable: lable in %s on line %d
+Warning: Undefined variable $lable in %s on line %d
bool(true)
-Warning: Undefined variable: lable in %s on line %d
+Warning: Undefined variable $lable in %s on line %d
bool(false)
-Warning: Undefined variable: lable in %s on line %d
+Warning: Undefined variable $lable in %s on line %d
bool(true)
object(Point)#%d (3) {
["x"]=>
@@ -1262,7 +1262,7 @@ bool(false)
bool(false)
bool(true)
-Warning: Undefined variable: point1 in %s on line %d
+Warning: Undefined variable $point1 in %s on line %d
NULL
bool(false)
bool(true)
@@ -1292,7 +1292,7 @@ value of static_var before unset: 1
bool(true)
bool(false)
-Warning: Undefined variable: static_var in %s on line %d
+Warning: Undefined variable $static_var in %s on line %d
value of static_var after unset:
bool(false)
bool(true)
@@ -1301,7 +1301,7 @@ value of static_var before unset: 2
bool(true)
bool(false)
-Warning: Undefined variable: static_var in %s on line %d
+Warning: Undefined variable $static_var in %s on line %d
value of static_var after unset:
bool(false)
bool(true)
@@ -1310,7 +1310,7 @@ value of static_var before unset: 3
bool(true)
bool(false)
-Warning: Undefined variable: static_var in %s on line %d
+Warning: Undefined variable $static_var in %s on line %d
value of static_var after unset:
bool(false)
bool(true)
diff --git a/Zend/tests/024.phpt b/Zend/tests/024.phpt
index d4e34972ee..5d8d55e6fa 100644
--- a/Zend/tests/024.phpt
+++ b/Zend/tests/024.phpt
@@ -15,30 +15,30 @@ var_dump($a->$b->{$c[1]});
?>
--EXPECTF--
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
NULL
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
-Warning: Undefined variable: c in %s on line %d
+Warning: Undefined variable $c in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
NULL
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
int(1)
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
-Warning: Undefined variable: b in %s on line %d
+Warning: Undefined variable $b in %s on line %d
int(0)
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
NULL
-Warning: Undefined variable: b in %s on line %d
+Warning: Undefined variable $b in %s on line %d
int(1)
Warning: Trying to get property '1' of non-object in %s on line %d
@@ -47,7 +47,7 @@ NULL
Warning: Trying to get property '1' of non-object in %s on line %d
NULL
-Warning: Undefined variable: c in %s on line %d
+Warning: Undefined variable $c in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt
index 652db2de20..75ae71a674 100644
--- a/Zend/tests/033.phpt
+++ b/Zend/tests/033.phpt
@@ -25,7 +25,7 @@ try {
?>
--EXPECTF--
-Warning: Undefined variable: arr in %s on line %d
+Warning: Undefined variable $arr in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
@@ -37,7 +37,7 @@ Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
-Warning: Undefined variable: arr in %s on line %d
+Warning: Undefined variable $arr in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
@@ -49,7 +49,7 @@ Warning: Trying to access array offset on value of type null in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
-Warning: Undefined variable: arr in %s on line %d
+Warning: Undefined variable $arr in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
diff --git a/Zend/tests/array_unpack/undef_var.phpt b/Zend/tests/array_unpack/undef_var.phpt
index 945717db76..ce02fd3e6c 100644
--- a/Zend/tests/array_unpack/undef_var.phpt
+++ b/Zend/tests/array_unpack/undef_var.phpt
@@ -6,7 +6,7 @@ array unpacking with undefinded variable
var_dump([...$arr]);
--EXPECTF--
-Warning: Undefined variable: arr in %s on line %d
+Warning: Undefined variable $arr in %s on line %d
Fatal error: Uncaught Error: Only arrays and Traversables can be unpacked in %s:%d
Stack trace:
diff --git a/Zend/tests/arrow_functions/002.phpt b/Zend/tests/arrow_functions/002.phpt
index 76254fc69a..b805b57c60 100644
--- a/Zend/tests/arrow_functions/002.phpt
+++ b/Zend/tests/arrow_functions/002.phpt
@@ -9,5 +9,5 @@ var_dump((fn() => $b + $c)());
?>
--EXPECTF--
-Warning: Undefined variable: c in %s on line %d
+Warning: Undefined variable $c in %s on line %d
int(1)
diff --git a/Zend/tests/arrow_functions/003.phpt b/Zend/tests/arrow_functions/003.phpt
index 4e6998c9d1..ae72efedc6 100644
--- a/Zend/tests/arrow_functions/003.phpt
+++ b/Zend/tests/arrow_functions/003.phpt
@@ -14,8 +14,8 @@ var_dump($fn());
?>
--EXPECTF--
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
NULL
-Warning: Undefined variable: 5 in %s on line %d
+Warning: Undefined variable $5 in %s on line %d
NULL
diff --git a/Zend/tests/bug29896.phpt b/Zend/tests/bug29896.phpt
index 6b96ac4704..b32a25e8d9 100644
--- a/Zend/tests/bug29896.phpt
+++ b/Zend/tests/bug29896.phpt
@@ -22,6 +22,6 @@ function GenerateError2($A1)
GenerateError2("Test2");
?>
--EXPECTF--
-#0 userErrorHandler(2, Undefined variable: b, %s, %d) called at [%s:%d]
+#0 userErrorHandler(2, Undefined variable $b, %s, %d) called at [%s:%d]
#1 GenerateError1(Test1) called at [%sbug29896.php:16]
#2 GenerateError2(Test2) called at [%sbug29896.php:19]
diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt
index 6cefd62ea7..808720b88f 100644
--- a/Zend/tests/bug30162.phpt
+++ b/Zend/tests/bug30162.phpt
@@ -42,7 +42,7 @@ $db = new hariCow;
var_dump($db);
?>
--EXPECTF--
-Warning: Undefined variable: db in %s on line %d
+Warning: Undefined variable $db in %s on line %d
NULL
object(hariCow)#%d (2) {
["x"]=>
diff --git a/Zend/tests/bug31720.phpt b/Zend/tests/bug31720.phpt
index fb3992ecee..e1ef782138 100644
--- a/Zend/tests/bug31720.phpt
+++ b/Zend/tests/bug31720.phpt
@@ -11,5 +11,5 @@ try {
}
?>
--EXPECTF--
-Warning: Undefined variable: nonesuchvar in %s on line %d
+Warning: Undefined variable $nonesuchvar in %s on line %d
array_walk(): Argument #2 ($funcname) must be a valid callback, first array member is not a valid class name or object
diff --git a/Zend/tests/bug39036.phpt b/Zend/tests/bug39036.phpt
index 4179ba5420..669ca9255e 100644
--- a/Zend/tests/bug39036.phpt
+++ b/Zend/tests/bug39036.phpt
@@ -14,6 +14,6 @@ var_dump($key);
echo "Done\n";
?>
--EXPECTF--
-Warning: Undefined variable: key in %s on line %d
+Warning: Undefined variable $key in %s on line %d
NULL
Done
diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/bug41209.phpt
index da9f57163d..441a9fc0b6 100644
--- a/Zend/tests/bug41209.phpt
+++ b/Zend/tests/bug41209.phpt
@@ -39,7 +39,7 @@ var_dump(isset($cache[$id]));
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d
+Fatal error: Uncaught ErrorException: Undefined variable $id in %s:%d
Stack trace:
#0 %s(%d): env::errorHandler(2, 'Undefined varia...', '%s', %d)
#1 {main}
diff --git a/Zend/tests/bug43201.phpt b/Zend/tests/bug43201.phpt
index 3608effab7..49816ea1c1 100644
--- a/Zend/tests/bug43201.phpt
+++ b/Zend/tests/bug43201.phpt
@@ -26,29 +26,29 @@ Notice: Indirect modification of overloaded property Foo::$arr has no effect in
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 14
-Warning: Undefined variable: ref in %s on line %d
+Warning: Undefined variable $ref in %s on line %d
-Warning: Undefined variable: undef in %s on line %d
+Warning: Undefined variable $undef in %s on line %d
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
-Warning: Undefined variable: undef in %s on line %d
+Warning: Undefined variable $undef in %s on line %d
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
-Warning: Undefined variable: undef in %s on line %d
+Warning: Undefined variable $undef in %s on line %d
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
-Warning: Undefined variable: undef in %s on line %d
+Warning: Undefined variable $undef in %s on line %d
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
-Warning: Undefined variable: undef in %s on line %d
+Warning: Undefined variable $undef in %s on line %d
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
-Warning: Undefined variable: undef in %s on line %d
+Warning: Undefined variable $undef in %s on line %d
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
ok
diff --git a/Zend/tests/bug47109.phpt b/Zend/tests/bug47109.phpt
index 4f8f4b9328..b796c420bd 100644
--- a/Zend/tests/bug47109.phpt
+++ b/Zend/tests/bug47109.phpt
@@ -5,6 +5,6 @@ Bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object)
$a->{"a"."b"};
?>
--EXPECTF--
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
Warning: Trying to get property 'ab' of non-object in %s on line %d
diff --git a/Zend/tests/bug52001.phpt b/Zend/tests/bug52001.phpt
index 36170eb96b..b473157511 100644
--- a/Zend/tests/bug52001.phpt
+++ b/Zend/tests/bug52001.phpt
@@ -11,7 +11,7 @@ var_dump($temp1);
function a($b,$c) {}
?>
--EXPECTF--
-Warning: Undefined variable: var in %s on line %d
+Warning: Undefined variable $var in %s on line %d
-Warning: Undefined variable: in %s on line %d
+Warning: Undefined variable $ in %s on line %d
int(1)
diff --git a/Zend/tests/bug52041.phpt b/Zend/tests/bug52041.phpt
index e5aca5c82e..8068b2d451 100644
--- a/Zend/tests/bug52041.phpt
+++ b/Zend/tests/bug52041.phpt
@@ -47,47 +47,47 @@ foo()[0][0] += 2;
var_dump(foo());
?>
--EXPECTF--
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Attempt to assign property 'a' of non-object
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Attempt to modify property 'a' of non-object
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Attempt to increment/decrement property 'a' of non-object
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Attempt to modify property 'a' of non-object
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Attempt to assign property 'a' of non-object
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Attempt to modify property 'a' of non-object
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Notice: Undefined offset: 0 in %s on line %d
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Notice: Undefined offset: 0 in %s on line %d
Notice: Undefined offset: 0 in %s on line %d
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Notice: Undefined offset: 0 in %s on line %d
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
Notice: Undefined offset: 0 in %s on line %d
Notice: Undefined offset: 0 in %s on line %d
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
NULL
diff --git a/Zend/tests/bug61767.phpt b/Zend/tests/bug61767.phpt
index 3bc1e49d09..b1b87b1935 100644
--- a/Zend/tests/bug61767.phpt
+++ b/Zend/tests/bug61767.phpt
@@ -15,9 +15,9 @@ register_shutdown_function(function(){
//$undefined = null; // defined variable does not cause problems
$undefined->foo();
--EXPECTF--
-Error handler called (Undefined variable: undefined)
+Error handler called (Undefined variable $undefined)
-Fatal error: Uncaught ErrorException: Undefined variable: undefined in %sbug61767.php:%d
+Fatal error: Uncaught ErrorException: Undefined variable $undefined in %sbug61767.php:%d
Stack trace:
#0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d)
#1 {main}
diff --git a/Zend/tests/bug67314.phpt b/Zend/tests/bug67314.phpt
index 3ef225de03..beb44af667 100644
--- a/Zend/tests/bug67314.phpt
+++ b/Zend/tests/bug67314.phpt
@@ -15,8 +15,8 @@ echo "made it once\n";
crash();
echo "ok\n";
--EXPECTF--
-Warning: Undefined variable: i in %s on line %d
+Warning: Undefined variable $i in %s on line %d
made it once
-Warning: Undefined variable: i in %s on line %d
+Warning: Undefined variable $i in %s on line %d
ok
diff --git a/Zend/tests/bug70124.phpt b/Zend/tests/bug70124.phpt
index 4a6c46cbfa..51f592d24d 100644
--- a/Zend/tests/bug70124.phpt
+++ b/Zend/tests/bug70124.phpt
@@ -39,7 +39,7 @@ try {
}
?>
--EXPECTF--
-Warning: Undefined variable: f in %s on line %d
+Warning: Undefined variable $f in %s on line %d
string(34) "Value of type null is not callable"
string(31) "Call to undefined method A::y()"
string(31) "Call to undefined method A::y()"
diff --git a/Zend/tests/bug72944.phpt b/Zend/tests/bug72944.phpt
index 0ddc99ff3b..b5c76be3ae 100644
--- a/Zend/tests/bug72944.phpt
+++ b/Zend/tests/bug72944.phpt
@@ -7,5 +7,5 @@ define('e', 'e');
echo "OK\n";
?>
--EXPECTF--
-Warning: Undefined variable: A in %s on line %d
+Warning: Undefined variable $A in %s on line %d
OK
diff --git a/Zend/tests/bug75921.phpt b/Zend/tests/bug75921.phpt
index a8649262b5..c309266d93 100644
--- a/Zend/tests/bug75921.phpt
+++ b/Zend/tests/bug75921.phpt
@@ -47,21 +47,21 @@ unset($null);
--EXPECTF--
Attempt to assign property 'a' of non-object
-Warning: Undefined variable: null in %s on line %d
+Warning: Undefined variable $null in %s on line %d
NULL
Attempt to modify property 'a' of non-object
-Warning: Undefined variable: null in %s on line %d
+Warning: Undefined variable $null in %s on line %d
NULL
Attempt to modify property 'a' of non-object
-Warning: Undefined variable: null in %s on line %d
+Warning: Undefined variable $null in %s on line %d
NULL
Attempt to modify property 'a' of non-object
-Warning: Undefined variable: null in %s on line %d
+Warning: Undefined variable $null in %s on line %d
NULL
Attempt to modify property 'a' of non-object
-Warning: Undefined variable: null in %s on line %d
+Warning: Undefined variable $null in %s on line %d
NULL
diff --git a/Zend/tests/bug76667.phpt b/Zend/tests/bug76667.phpt
index 1510c0f73a..259329722e 100644
--- a/Zend/tests/bug76667.phpt
+++ b/Zend/tests/bug76667.phpt
@@ -19,19 +19,19 @@ $x = new T;
$x->x = 1;
?>
--EXPECTF--
-Warning: Undefined variable: undefined in %s on line %d
+Warning: Undefined variable $undefined in %s on line %d
Warning: Trying to get property '1' of non-object in %s on line %d
Warning: Division by zero in %sbug76667.php on line %d
-Warning: Undefined variable: undefined in %s on line %d
+Warning: Undefined variable $undefined in %s on line %d
Warning: Trying to get property 'NAN' of non-object in %s on line %d
Warning: Division by zero in %sbug76667.php on line %d
-Warning: Undefined variable: undefined in %s on line %d
+Warning: Undefined variable $undefined in %s on line %d
Warning: Trying to get property 'NAN' of non-object in %s on line %d
diff --git a/Zend/tests/bug78531.phpt b/Zend/tests/bug78531.phpt
index 1e8f0b34d1..682ff50c5b 100644
--- a/Zend/tests/bug78531.phpt
+++ b/Zend/tests/bug78531.phpt
@@ -24,14 +24,14 @@ try {
}
?>
--EXPECTF--
-Warning: Undefined variable: u1 in %s on line %d
+Warning: Undefined variable $u1 in %s on line %d
Attempt to assign property 'a' of non-object
-Warning: Undefined variable: u2 in %s on line %d
+Warning: Undefined variable $u2 in %s on line %d
Attempt to increment/decrement property 'a' of non-object
-Warning: Undefined variable: u3 in %s on line %d
+Warning: Undefined variable $u3 in %s on line %d
Attempt to increment/decrement property 'a' of non-object
-Warning: Undefined variable: u4 in %s on line %d
+Warning: Undefined variable $u4 in %s on line %d
Attempt to modify property 'a' of non-object
diff --git a/Zend/tests/call_user_func_002.phpt b/Zend/tests/call_user_func_002.phpt
index c06803334a..b25d9cbb41 100644
--- a/Zend/tests/call_user_func_002.phpt
+++ b/Zend/tests/call_user_func_002.phpt
@@ -34,8 +34,8 @@ string(3) "foo"
call_user_func(): Argument #1 ($function) must be a valid callback, class 'foo' not found
call_user_func(): Argument #1 ($function) must be a valid callback, class '' not found
-Warning: Undefined variable: foo in %s on line %d
+Warning: Undefined variable $foo in %s on line %d
call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object
-Warning: Undefined variable: foo in %s on line %d
+Warning: Undefined variable $foo in %s on line %d
call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object
diff --git a/Zend/tests/clone_003.phpt b/Zend/tests/clone_003.phpt
index 02ff350ca2..f163616a87 100644
--- a/Zend/tests/clone_003.phpt
+++ b/Zend/tests/clone_003.phpt
@@ -7,7 +7,7 @@ $a = clone $b;
?>
--EXPECTF--
-Warning: Undefined variable: b in %s on line %d
+Warning: Undefined variable $b in %s on line %d
Fatal error: Uncaught Error: __clone method called on non-object in %s:%d
Stack trace:
diff --git a/Zend/tests/closure_012.phpt b/Zend/tests/closure_012.phpt
index f02045f5b1..044de936ca 100644
--- a/Zend/tests/closure_012.phpt
+++ b/Zend/tests/closure_012.phpt
@@ -16,8 +16,8 @@ $lambda();
var_dump($i);
?>
--EXPECTF--
-Warning: Undefined variable: i in %s on line %d
+Warning: Undefined variable $i in %s on line %d
-Warning: Undefined variable: i in %s on line %d
+Warning: Undefined variable $i in %s on line %d
NULL
int(2)
diff --git a/Zend/tests/closure_027.phpt b/Zend/tests/closure_027.phpt
index ceffcd72ab..7ecfa55e0f 100644
--- a/Zend/tests/closure_027.phpt
+++ b/Zend/tests/closure_027.phpt
@@ -27,7 +27,7 @@ object(stdClass)#%d (0) {
}
NULL
-Warning: Undefined variable: y in %s on line %d
+Warning: Undefined variable $y in %s on line %d
Exception: Too few arguments to function {closure}(), 0 passed in %s on line %d and exactly 1 expected
Fatal error: Uncaught TypeError: test(): Argument #1 ($a) must be of type Closure, stdClass given, called in %s:%d
diff --git a/Zend/tests/dereference_007.phpt b/Zend/tests/dereference_007.phpt
index 4d677c6ea1..90fed2cfb8 100644
--- a/Zend/tests/dereference_007.phpt
+++ b/Zend/tests/dereference_007.phpt
@@ -33,5 +33,5 @@ print "ok\n";
?>
--EXPECTF--
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
ok
diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call_004.phpt
index 9028b1c801..e29671f711 100644
--- a/Zend/tests/dynamic_call_004.phpt
+++ b/Zend/tests/dynamic_call_004.phpt
@@ -7,7 +7,7 @@ $a::$b();
?>
--EXPECTF--
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
Fatal error: Uncaught Error: Class name must be a valid object or a string in %s:%d
Stack trace:
diff --git a/Zend/tests/entry_block_with_predecessors.phpt b/Zend/tests/entry_block_with_predecessors.phpt
index 45c3302fc0..ee1dc16b78 100644
--- a/Zend/tests/entry_block_with_predecessors.phpt
+++ b/Zend/tests/entry_block_with_predecessors.phpt
@@ -28,6 +28,6 @@ test2();
?>
--EXPECTF--
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
int(1)
int(2)
diff --git a/Zend/tests/errmsg_045.phpt b/Zend/tests/errmsg_045.phpt
index 8ecee5ca3b..172f56f26b 100644
--- a/Zend/tests/errmsg_045.phpt
+++ b/Zend/tests/errmsg_045.phpt
@@ -17,4 +17,4 @@ eval('class A { private function __invoke() { } }');
string(76) "The magic method __invoke() must have public visibility and cannot be static"
string(%d) "%s(%d) : eval()'d code"
-Warning: Undefined variable: undefined in %s on line %d
+Warning: Undefined variable $undefined in %s on line %d
diff --git a/Zend/tests/error_reporting03.phpt b/Zend/tests/error_reporting03.phpt
index c21b363113..d6c442bebb 100644
--- a/Zend/tests/error_reporting03.phpt
+++ b/Zend/tests/error_reporting03.phpt
@@ -30,6 +30,6 @@ var_dump(error_reporting());
echo "Done\n";
?>
--EXPECTF--
-Warning: Undefined variable: undef2 in %s on line %d
+Warning: Undefined variable $undef2 in %s on line %d
int(32767)
Done
diff --git a/Zend/tests/error_reporting04.phpt b/Zend/tests/error_reporting04.phpt
index 8a70e7d17b..f53565de9e 100644
--- a/Zend/tests/error_reporting04.phpt
+++ b/Zend/tests/error_reporting04.phpt
@@ -18,6 +18,6 @@ var_dump(error_reporting());
echo "Done\n";
?>
--EXPECTF--
-Warning: Undefined variable: undef in %s on line %d
+Warning: Undefined variable $undef in %s on line %d
int(32767)
Done
diff --git a/Zend/tests/error_reporting05.phpt b/Zend/tests/error_reporting05.phpt
index 77b3914e7a..9ffd3971a1 100644
--- a/Zend/tests/error_reporting05.phpt
+++ b/Zend/tests/error_reporting05.phpt
@@ -27,8 +27,8 @@ var_dump(error_reporting());
echo "Done\n";
?>
--EXPECTF--
-Warning: Undefined variable: undef_value in %s on line %d
+Warning: Undefined variable $undef_value in %s on line %d
-Warning: Undefined variable: undef_name in %s on line %d
+Warning: Undefined variable $undef_name in %s on line %d
int(32767)
Done
diff --git a/Zend/tests/error_reporting08.phpt b/Zend/tests/error_reporting08.phpt
index 3b6d3cb487..2450abfc67 100644
--- a/Zend/tests/error_reporting08.phpt
+++ b/Zend/tests/error_reporting08.phpt
@@ -27,6 +27,6 @@ var_dump(error_reporting());
echo "Done\n";
?>
--EXPECTF--
-Warning: Undefined variable: undef3 in %s on line %d
+Warning: Undefined variable $undef3 in %s on line %d
int(32767)
Done
diff --git a/Zend/tests/error_reporting09.phpt b/Zend/tests/error_reporting09.phpt
index 216365a3a1..39e52adbf5 100644
--- a/Zend/tests/error_reporting09.phpt
+++ b/Zend/tests/error_reporting09.phpt
@@ -24,8 +24,8 @@ var_dump(error_reporting());
echo "Done\n";
?>
--EXPECTF--
-Warning: Undefined variable: blah in %s on line %d
+Warning: Undefined variable $blah in %s on line %d
-Warning: Undefined variable: undef2 in %s on line %d
+Warning: Undefined variable $undef2 in %s on line %d
int(32767)
Done
diff --git a/Zend/tests/exception_before_fatal.phpt b/Zend/tests/exception_before_fatal.phpt
index 7a1399fb7a..edc63b2394 100644
--- a/Zend/tests/exception_before_fatal.phpt
+++ b/Zend/tests/exception_before_fatal.phpt
@@ -55,10 +55,10 @@ try {
}
?>
--EXPECT--
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
-string(23) "Undefined variable: foo"
+string(23) "Undefined variable $foo"
+string(23) "Undefined variable $foo"
+string(23) "Undefined variable $foo"
+string(23) "Undefined variable $foo"
+string(23) "Undefined variable $foo"
+string(23) "Undefined variable $foo"
+string(23) "Undefined variable $foo"
diff --git a/Zend/tests/foreach_undefined.phpt b/Zend/tests/foreach_undefined.phpt
index 0d46f7cec4..47a1e3053f 100644
--- a/Zend/tests/foreach_undefined.phpt
+++ b/Zend/tests/foreach_undefined.phpt
@@ -8,7 +8,7 @@ foreach($a as $val);
echo "Done\n";
?>
--EXPECTF--
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
Warning: foreach() argument must be of type array|object, null given in %s on line %d
Done
diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt
index 821f345b81..6e8caccc91 100644
--- a/Zend/tests/globals_001.phpt
+++ b/Zend/tests/globals_001.phpt
@@ -29,6 +29,6 @@ string(%d) "%s"
Notice: Undefined index: PHP_SELF in %s on line %d
NULL
-Warning: Undefined variable: _SERVER in %s on line %d
+Warning: Undefined variable $_SERVER in %s on line %d
NULL
Done
diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals_002.phpt
index b8f2dadd4d..d62ff83631 100644
--- a/Zend/tests/globals_002.phpt
+++ b/Zend/tests/globals_002.phpt
@@ -32,6 +32,6 @@ string(%d) "%s"
Notice: Undefined index: PHP_SELF in %s on line %d
NULL
-Warning: Undefined variable: _SERVER in %s on line %d
+Warning: Undefined variable $_SERVER in %s on line %d
NULL
Done
diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals_003.phpt
index d7a175389e..bc0c742a33 100644
--- a/Zend/tests/globals_003.phpt
+++ b/Zend/tests/globals_003.phpt
@@ -38,6 +38,6 @@ string(%d) "%s"
Notice: Undefined index: PHP_SELF in %s on line %d
NULL
-Warning: Undefined variable: _SERVER in %s on line %d
+Warning: Undefined variable $_SERVER in %s on line %d
NULL
Done
diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt
index 4aaf2438d7..7121bb3297 100644
--- a/Zend/tests/globals_004.phpt
+++ b/Zend/tests/globals_004.phpt
@@ -23,6 +23,6 @@ string(%d) "%s"
Notice: Undefined index: PHP_SELF in %s on line %d
NULL
-Warning: Undefined variable: _SERVER in %s on line %d
+Warning: Undefined variable $_SERVER in %s on line %d
NULL
Done
diff --git a/Zend/tests/inference_infinite_loop.phpt b/Zend/tests/inference_infinite_loop.phpt
index ffa5cdbf89..a0f56e2d2b 100644
--- a/Zend/tests/inference_infinite_loop.phpt
+++ b/Zend/tests/inference_infinite_loop.phpt
@@ -14,4 +14,4 @@ test();
?>
--EXPECTF--
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
diff --git a/Zend/tests/isset_003.phpt b/Zend/tests/isset_003.phpt
index 7b29c1e6b8..dc7f045de3 100644
--- a/Zend/tests/isset_003.phpt
+++ b/Zend/tests/isset_003.phpt
@@ -29,9 +29,9 @@ bool(true)
bool(false)
bool(false)
-Warning: Undefined variable: c in %s on line %d
+Warning: Undefined variable $c in %s on line %d
-Warning: Undefined variable: d in %s on line %d
+Warning: Undefined variable $d in %s on line %d
Warning: Trying to access array offset on value of type null in %s on line %d
diff --git a/Zend/tests/method_argument_binding.phpt b/Zend/tests/method_argument_binding.phpt
index 32acd93c63..f01690ea4e 100644
--- a/Zend/tests/method_argument_binding.phpt
+++ b/Zend/tests/method_argument_binding.phpt
@@ -43,4 +43,4 @@ class E extends D {
--EXPECTF--
int(2)
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
diff --git a/Zend/tests/this_in_extract.phpt b/Zend/tests/this_in_extract.phpt
index ef0a25a279..2e3f7b497f 100644
--- a/Zend/tests/this_in_extract.phpt
+++ b/Zend/tests/this_in_extract.phpt
@@ -15,5 +15,5 @@ foo();
--EXPECTF--
Cannot re-assign $this
-Warning: Undefined variable: a in %s on line %d
+Warning: Undefined variable $a in %s on line %d
NULL
diff --git a/Zend/tests/unset_cv01.phpt b/Zend/tests/unset_cv01.phpt
index 508a0cbf3e..55dac22e50 100644
--- a/Zend/tests/unset_cv01.phpt
+++ b/Zend/tests/unset_cv01.phpt
@@ -10,4 +10,4 @@ echo $x;
--EXPECTF--
ok
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
diff --git a/Zend/tests/unset_cv02.phpt b/Zend/tests/unset_cv02.phpt
index 915b165eca..8e42005db3 100644
--- a/Zend/tests/unset_cv02.phpt
+++ b/Zend/tests/unset_cv02.phpt
@@ -10,4 +10,4 @@ echo $x;
--EXPECTF--
ok
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
diff --git a/Zend/tests/unset_cv03.phpt b/Zend/tests/unset_cv03.phpt
index dce3fce5f1..87f04d50ca 100644
--- a/Zend/tests/unset_cv03.phpt
+++ b/Zend/tests/unset_cv03.phpt
@@ -10,4 +10,4 @@ echo $x;
--EXPECTF--
ok
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
diff --git a/Zend/tests/unset_cv04.phpt b/Zend/tests/unset_cv04.phpt
index 816a5f9ce4..e746059727 100644
--- a/Zend/tests/unset_cv04.phpt
+++ b/Zend/tests/unset_cv04.phpt
@@ -13,4 +13,4 @@ f();
--EXPECTF--
ok
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
diff --git a/Zend/tests/unset_cv09.phpt b/Zend/tests/unset_cv09.phpt
index a52062575c..63a7eab0f2 100644
--- a/Zend/tests/unset_cv09.phpt
+++ b/Zend/tests/unset_cv09.phpt
@@ -10,5 +10,5 @@ echo "ok\n";
--EXPECTF--
ok
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
ok
diff --git a/Zend/tests/unset_cv10.phpt b/Zend/tests/unset_cv10.phpt
index 97a79bb973..c62b8ae57a 100644
--- a/Zend/tests/unset_cv10.phpt
+++ b/Zend/tests/unset_cv10.phpt
@@ -12,5 +12,5 @@ echo "ok\n";
--EXPECTF--
ok
-Warning: Undefined variable: x in %s on line %d
+Warning: Undefined variable $x in %s on line %d
ok