diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-03-30 17:23:03 +0200 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-03-31 13:02:32 +0200 |
| commit | 36935e42eac054a422b7edade69923db7727f268 (patch) | |
| tree | e8d08101f42f5e8ee60ed423833df08725130807 | |
| parent | 6bf483a94abcac24a3f1fc09feed2c6fbf5d648f (diff) | |
| download | php-git-36935e42eac054a422b7edade69923db7727f268.tar.gz | |
Improve undefined variable error messages
Closes GH-5312
126 files changed, 400 insertions, 400 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 diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6f6fb59eca..9ca916df8a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -265,7 +265,7 @@ static zend_never_inline ZEND_COLD zval* zval_undefined_cv(uint32_t var EXECUTE_ { if (EXPECTED(EG(exception) == NULL)) { zend_string *cv = CV_DEF_OF(EX_VAR_TO_NUM(var)); - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(cv)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(cv)); } return &EG(uninitialized_zval); } @@ -3239,7 +3239,7 @@ static zend_never_inline void zend_fetch_this_var(int type OPLINE_DC EXECUTE_DAT Z_ADDREF_P(result); } else { ZVAL_NULL(result); - zend_error(E_WARNING, "Undefined variable: this"); + zend_error(E_WARNING, "Undefined variable $this"); } break; case BP_VAR_IS: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index aac7ee0deb..84c0231ce4 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1713,7 +1713,7 @@ ZEND_VM_C_LABEL(fetch_this): } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -1732,7 +1732,7 @@ ZEND_VM_C_LABEL(fetch_this): } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7aba0b82cf..67c5e2bdca 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -8532,7 +8532,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -8551,7 +8551,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { @@ -16121,7 +16121,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -16140,7 +16140,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { @@ -44003,7 +44003,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval)); } else { @@ -44022,7 +44022,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(name)); if (type == BP_VAR_RW) { ZVAL_NULL(retval); } else { diff --git a/ext/oci8/tests/fetch_into2.phpt b/ext/oci8/tests/fetch_into2.phpt index 8c166e1eca..13467e0e54 100644 --- a/ext/oci8/tests/fetch_into2.phpt +++ b/ext/oci8/tests/fetch_into2.phpt @@ -53,7 +53,7 @@ echo "Done\n"; Warning: ocifetchinto() expects at least 2 parameters, 1 given in %s on line %d NULL -Notice: Undefined variable: all in %s on line %d +Notice: Undefined variable $all in %s on line %d NULL Warning: ocifetchinto() expects at most 3 parameters, 4 given in %s on line %d diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c index 21c325bf5b..3bfce1a854 100644 --- a/ext/opcache/jit/zend_jit_helpers.c +++ b/ext/opcache/jit/zend_jit_helpers.c @@ -247,7 +247,7 @@ static void ZEND_FASTCALL zend_jit_undefined_op_helper(uint32_t var) const zend_execute_data *execute_data = EG(current_execute_data); zend_string *cv = EX(func)->op_array.vars[EX_VAR_TO_NUM(var)]; - zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(cv)); + zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(cv)); } static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim, zval *result) diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index b7792d41e1..3029d911ba 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -3414,7 +3414,7 @@ static int zend_jit_inc_dec(dasm_State **Dst, const zend_op *opline, const zend_ | SAVE_VALID_OPLINE opline, r0 if (op1_info & MAY_BE_UNDEF) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >2 - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 | SET_ZVAL_TYPE_INFO op1_addr, IS_NULL @@ -4877,7 +4877,7 @@ static int zend_jit_simple_assign(dasm_State **Dst, |.cold_code |1: } - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); if (Z_REG(var_addr) != ZREG_FP) { | mov aword T1, Ra(Z_REG(var_addr)) // save } @@ -6632,7 +6632,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6647,7 +6647,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov aword T1, FCARG1a // save | mov FCARG1d, opline->op2.var @@ -6666,7 +6666,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6686,7 +6686,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, const zen | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | SAVE_VALID_OPLINE opline, r0 | mov FCARG1d, opline->op2.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -9718,7 +9718,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst, const zend_op *opline, cons | SAVE_VALID_OPLINE opline, r0 if (opline->opcode != ZEND_FETCH_DIM_IS && (op1_info & MAY_BE_UNDEF)) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >1 - | // zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); + | // zend_error(E_WARNING, "Undefined variable $%s", ZSTR_VAL(CV_DEF_OF(EX_VAR_TO_NUM(opline->op1.var)))); | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 |1: diff --git a/ext/opcache/tests/block_pass_001.phpt b/ext/opcache/tests/block_pass_001.phpt index 7fab78bbe8..2fe17a857a 100644 --- a/ext/opcache/tests/block_pass_001.phpt +++ b/ext/opcache/tests/block_pass_001.phpt @@ -9,4 +9,4 @@ Block pass: Bugs in BOOL/QM_ASSIGN elision (bool) new stdClass; ?> --EXPECTF-- -Warning: Undefined variable: x in %s on line %d +Warning: Undefined variable $x in %s on line %d diff --git a/ext/opcache/tests/bool_not_cv.phpt b/ext/opcache/tests/bool_not_cv.phpt index cc28edcc01..926dc58af9 100644 --- a/ext/opcache/tests/bool_not_cv.phpt +++ b/ext/opcache/tests/bool_not_cv.phpt @@ -26,9 +26,9 @@ undef_bool_cast(); --EXPECTF-- In undef_negation -Warning: Undefined variable: v in %s on line 4 +Warning: Undefined variable $v in %s on line 4 true In undef_bool_cast -Warning: Undefined variable: v in %s on line 10 +Warning: Undefined variable $v in %s on line 10 false diff --git a/ext/opcache/tests/bug73668.phpt b/ext/opcache/tests/bug73668.phpt index b2a0508aa5..a94204d7b5 100644 --- a/ext/opcache/tests/bug73668.phpt +++ b/ext/opcache/tests/bug73668.phpt @@ -7,4 +7,4 @@ Bug #73668: "SIGFPE Arithmetic exception" in opcache when divide by minus 1 $a/-1; ?> --EXPECTF-- -Warning: Undefined variable: a in %s on line %d +Warning: Undefined variable $a in %s on line %d diff --git a/ext/opcache/tests/bug76446.phpt b/ext/opcache/tests/bug76446.phpt index a2b02de032..41802747cd 100644 --- a/ext/opcache/tests/bug76446.phpt +++ b/ext/opcache/tests/bug76446.phpt @@ -18,5 +18,5 @@ function test() var_dump(test()); ?> --EXPECTF-- -Warning: Undefined variable: addlang in %s on line %d +Warning: Undefined variable $addlang in %s on line %d int(0) diff --git a/ext/opcache/tests/bug77058.phpt b/ext/opcache/tests/bug77058.phpt index 18d510bbde..0583b3b170 100644 --- a/ext/opcache/tests/bug77058.phpt +++ b/ext/opcache/tests/bug77058.phpt @@ -18,5 +18,5 @@ myfunc(); ?> --EXPECTF-- -Warning: Undefined variable: x in %s on line %d +Warning: Undefined variable $x in %s on line %d '2' is expected to be 2 diff --git a/ext/opcache/tests/bug79412.phpt b/ext/opcache/tests/bug79412.phpt index 6c9232ff85..327da1fea2 100644 --- a/ext/opcache/tests/bug79412.phpt +++ b/ext/opcache/tests/bug79412.phpt @@ -20,6 +20,6 @@ foreach ($foo as $bar) { } ?> --EXPECTF-- -Warning: Undefined variable: foo in %s on line %d +Warning: Undefined variable $foo in %s on line %d Warning: foreach() argument must be of type array|object, null given in %s on line %d diff --git a/ext/opcache/tests/jit/assign_022.phpt b/ext/opcache/tests/jit/assign_022.phpt index 8298c28b22..062b2f8950 100644 --- a/ext/opcache/tests/jit/assign_022.phpt +++ b/ext/opcache/tests/jit/assign_022.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_023.phpt b/ext/opcache/tests/jit/assign_023.phpt index e1211f5569..5007917c1f 100644 --- a/ext/opcache/tests/jit/assign_023.phpt +++ b/ext/opcache/tests/jit/assign_023.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_024.phpt b/ext/opcache/tests/jit/assign_024.phpt index f77296f84d..5bc63887ab 100644 --- a/ext/opcache/tests/jit/assign_024.phpt +++ b/ext/opcache/tests/jit/assign_024.phpt @@ -19,5 +19,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d ok diff --git a/ext/opcache/tests/jit/assign_025.phpt b/ext/opcache/tests/jit/assign_025.phpt index 9bafa43cb6..79000baf0e 100644 --- a/ext/opcache/tests/jit/assign_025.phpt +++ b/ext/opcache/tests/jit/assign_025.phpt @@ -20,5 +20,5 @@ function foo() { foo(); echo "ok\n"; --EXPECTF-- -Warning: Undefined variable: ref in %s on line %d +Warning: Undefined variable $ref in %s on line %d ok diff --git a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt index 39b9fd33ff..c5772220cb 100644 --- a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt +++ b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt @@ -16,7 +16,7 @@ function foo() { } var_dump(foo()); --EXPECTF-- -Warning: Undefined variable: a in %s on line %d +Warning: Undefined variable $a in %s on line %d Notice: Undefined offset: 0 in %sfetch_dim_rw_001.php on line 3 diff --git a/ext/opcache/tests/jit/type_check_001.phpt b/ext/opcache/tests/jit/type_check_001.phpt index 6573f0ebdc..5b5afc870b 100644 --- a/ext/opcache/tests/jit/type_check_001.phpt +++ b/ext/opcache/tests/jit/type_check_001.phpt @@ -22,4 +22,4 @@ try { } ?> --EXPECT-- -Exception: Undefined variable: a +Exception: Undefined variable $a diff --git a/ext/opcache/tests/jmpz_jmp_elim.phpt b/ext/opcache/tests/jmpz_jmp_elim.phpt index 434897bf80..546275dcde 100644 --- a/ext/opcache/tests/jmpz_jmp_elim.phpt +++ b/ext/opcache/tests/jmpz_jmp_elim.phpt @@ -14,5 +14,5 @@ echo "done\n"; ?> --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d done diff --git a/ext/opcache/tests/wrong_inlining_003.phpt b/ext/opcache/tests/wrong_inlining_003.phpt index c83a4efc36..12082e70e4 100644 --- a/ext/opcache/tests/wrong_inlining_003.phpt +++ b/ext/opcache/tests/wrong_inlining_003.phpt @@ -19,5 +19,5 @@ function test() { test(); ?> --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d int(42) diff --git a/ext/pdo_sqlite/tests/bug43831.phpt b/ext/pdo_sqlite/tests/bug43831.phpt index 1909d88033..bcb09c95a7 100644 --- a/ext/pdo_sqlite/tests/bug43831.phpt +++ b/ext/pdo_sqlite/tests/bug43831.phpt @@ -49,5 +49,5 @@ object(PDO)#%d (0) { object(MyPDO)#%d (0) { } -Warning: Undefined variable: bar in %s on line %d +Warning: Undefined variable $bar in %s on line %d NULL diff --git a/ext/reflection/tests/ReflectionParameter_003.phpt b/ext/reflection/tests/ReflectionParameter_003.phpt index 8396eeb97c..16a422caa4 100644 --- a/ext/reflection/tests/ReflectionParameter_003.phpt +++ b/ext/reflection/tests/ReflectionParameter_003.phpt @@ -56,7 +56,7 @@ foreach($refParameters as $parameter) { hello from test third is jack -Warning: Undefined variable: theIncrement in %s on line %d +Warning: Undefined variable $theIncrement in %s on line %d parameter names from staticMethod method: object(ReflectionParameter)#%d (1) { diff --git a/ext/session/tests/session_decode_variation3.phpt b/ext/session/tests/session_decode_variation3.phpt index b926de323e..1c89fac0bb 100644 --- a/ext/session/tests/session_decode_variation3.phpt +++ b/ext/session/tests/session_decode_variation3.phpt @@ -37,7 +37,7 @@ ob_end_flush(); Warning: session_start(): Cannot find serialization handler 'blah' - session startup failed in %s on line %d bool(false) -Warning: Undefined variable: _SESSION in %s on line %d +Warning: Undefined variable $_SESSION in %s on line %d NULL array(3) { ["foo"]=> diff --git a/ext/session/tests/session_set_save_handler_class_012.phpt b/ext/session/tests/session_set_save_handler_class_012.phpt index f81207d2a7..854c9fb8e1 100644 --- a/ext/session/tests/session_set_save_handler_class_012.phpt +++ b/ext/session/tests/session_set_save_handler_class_012.phpt @@ -52,7 +52,7 @@ Open Warning: session_start(): Failed to initialize storage module: user (path: ) in %s on line %d SessionHandler::open() expects exactly 2 parameters, 0 given -Warning: Undefined variable: _SESSION in %s on line %d +Warning: Undefined variable $_SESSION in %s on line %d string(0) "" string(5) "files" string(4) "user" diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt index c050ca2dd4..b389bcfc58 100644 --- a/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_xpath_4.phpt @@ -11,7 +11,7 @@ $xml = simplexml_load_string("XXXXXXX^",$x,0x6000000000000001); var_dump($xml); ?> --EXPECTF-- -Warning: Undefined variable: x in %s on line %d +Warning: Undefined variable $x in %s on line %d Warning: simplexml_load_string(): Invalid options in %s on line %d bool(false) diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt index 1dc93ceaa9..d05a635500 100644 --- a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt +++ b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt @@ -83,7 +83,7 @@ array(2) { --> exchangeArray() with no arg: Exception: ArrayObject::exchangeArray() expects exactly 1 parameter, 0 given -Warning: Undefined variable: copy in %s on line %d +Warning: Undefined variable $copy in %s on line %d object(ArrayObject)#2 (1) { ["storage":"ArrayObject":private]=> object(C)#3 (2) { @@ -105,7 +105,7 @@ NULL --> exchangeArray() with bad arg type: Exception:Passed variable is not an array or object -Warning: Undefined variable: copy in %s on line %d +Warning: Undefined variable $copy in %s on line %d object(ArrayObject)#3 (1) { ["storage":"ArrayObject":private]=> object(C)#2 (2) { diff --git a/ext/spl/tests/array_026.phpt b/ext/spl/tests/array_026.phpt index 7a1784e30e..268b39d5e8 100644 --- a/ext/spl/tests/array_026.phpt +++ b/ext/spl/tests/array_026.phpt @@ -8,7 +8,7 @@ $test['d1']['d3'] = 'world'; var_dump($test, $test3['mmmmm']); ?> --EXPECTF-- -Warning: Undefined variable: test3 in %s on line %d +Warning: Undefined variable $test3 in %s on line %d Warning: Trying to access array offset on value of type null in %s on line %d object(ArrayObject)#1 (1) { diff --git a/ext/spl/tests/bug62978.phpt b/ext/spl/tests/bug62978.phpt index 7e61d27b89..01ce807031 100644 --- a/ext/spl/tests/bug62978.phpt +++ b/ext/spl/tests/bug62978.phpt @@ -31,7 +31,7 @@ NULL Notice: Undefined index: epic_magic in %sbug62978.php 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 NULL diff --git a/ext/spl/tests/bug72888.phpt b/ext/spl/tests/bug72888.phpt index 5e1aa2344b..5ca99a40a5 100644 --- a/ext/spl/tests/bug72888.phpt +++ b/ext/spl/tests/bug72888.phpt @@ -14,5 +14,5 @@ var_dump($y); --EXPECTF-- string(60) "Trying to clone an uncloneable object of class SplFileObject" -Warning: Undefined variable: y in %s on line %d +Warning: Undefined variable $y in %s on line %d NULL 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 48fd772a04..a54b984b88 100644 --- a/ext/standard/tests/strings/ucfirst.phpt +++ b/ext/standard/tests/strings/ucfirst.phpt diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt index 30d50c805d..5bc7bbdb8e 100644 --- a/tests/basic/025.phpt +++ b/tests/basic/025.phpt @@ -15,7 +15,7 @@ Warning: Unknown: POST Content-Length of 2050 bytes exceeds the limit of 1024 by Warning: Cannot modify header information - headers already sent in Unknown on line 0 -Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable $HTTP_RAW_POST_DATA in %s on line %d array(0) { } NULL diff --git a/tests/basic/enable_post_data_reading_01.phpt b/tests/basic/enable_post_data_reading_01.phpt index d717b2b0b0..0ed3127392 100644 --- a/tests/basic/enable_post_data_reading_01.phpt +++ b/tests/basic/enable_post_data_reading_01.phpt @@ -18,7 +18,7 @@ array(0) { array(0) { } -Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable $HTTP_RAW_POST_DATA in %s on line %d NULL string(9) "a=1&b=ZYX" string(9) "a=1&b=ZYX" diff --git a/tests/basic/enable_post_data_reading_03.phpt b/tests/basic/enable_post_data_reading_03.phpt index 5982f61c91..8366226919 100644 --- a/tests/basic/enable_post_data_reading_03.phpt +++ b/tests/basic/enable_post_data_reading_03.phpt @@ -19,7 +19,7 @@ array(0) { array(0) { } -Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable $HTTP_RAW_POST_DATA in %s on line %d NULL string(9) "a=1&b=ZYX" string(9) "a=1&b=ZYX" diff --git a/tests/basic/enable_post_data_reading_04.phpt b/tests/basic/enable_post_data_reading_04.phpt index 17432e9298..71f62cbc8e 100644 --- a/tests/basic/enable_post_data_reading_04.phpt +++ b/tests/basic/enable_post_data_reading_04.phpt @@ -19,7 +19,7 @@ array(0) { array(0) { } -Warning: Undefined variable: HTTP_RAW_POST_DATA in %s on line %d +Warning: Undefined variable $HTTP_RAW_POST_DATA in %s on line %d NULL string(9) "a=1&b=ZYX" string(9) "a=1&b=ZYX" diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index 796c8d559e..c052d35701 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -55,7 +55,7 @@ Class constant declarations echo "\nYou should not see this."; ?> --EXPECTF-- -Warning: Undefined variable: undef in %s on line %d +Warning: Undefined variable $undef in %s on line %d Attempt to access various kinds of class constants: int(1) diff --git a/tests/lang/bison1.phpt b/tests/lang/bison1.phpt index f77cce0055..9af2af7b8b 100644 --- a/tests/lang/bison1.phpt +++ b/tests/lang/bison1.phpt @@ -5,5 +5,5 @@ Bison weirdness echo "blah-$foo\n"; ?> --EXPECTF-- -Warning: Undefined variable: foo in %s on line %d +Warning: Undefined variable $foo in %s on line %d blah- diff --git a/tests/lang/bug23584.phpt b/tests/lang/bug23584.phpt index b9dc10ac67..abc3532a63 100644 --- a/tests/lang/bug23584.phpt +++ b/tests/lang/bug23584.phpt @@ -10,4 +10,4 @@ echo $foo; ?> --EXPECTF-- -Warning: Undefined variable: foo in %s on line 6 +Warning: Undefined variable $foo in %s on line 6 diff --git a/tests/lang/bug25922.phpt b/tests/lang/bug25922.phpt index 96e8f596f1..a6b526ab78 100644 --- a/tests/lang/bug25922.phpt +++ b/tests/lang/bug25922.phpt @@ -19,6 +19,6 @@ function test() test(); ?> --EXPECT-- -Undefined variable: data +Undefined variable $data Trying to access array offset on value of type null Undefined index here: '' diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt index cfbc1b02de..11c3e32c50 100644 --- a/tests/lang/passByReference_003.phpt +++ b/tests/lang/passByReference_003.phpt @@ -25,7 +25,7 @@ var_dump($undef2) --EXPECTF-- Passing undefined by value -Warning: Undefined variable: undef1 in %s on line %d +Warning: Undefined variable $undef1 in %s on line %d Warning: Trying to access array offset on value of type null in %s on line %d @@ -34,7 +34,7 @@ NULL After call -Warning: Undefined variable: undef1 in %s on line %d +Warning: Undefined variable $undef1 in %s on line %d NULL Passing undefined by reference diff --git a/tests/lang/passByReference_005.phpt b/tests/lang/passByReference_005.phpt index 82b79b684f..72a42e550d 100644 --- a/tests/lang/passByReference_005.phpt +++ b/tests/lang/passByReference_005.phpt @@ -170,31 +170,31 @@ var_dump($u1, $u2); --EXPECTF-- ---- Pass by ref / pass by val: functions ---- -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d NULL string(11) "Ref changed" -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d NULL NULL -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d NULL string(11) "Ref changed" -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d string(11) "Ref changed" NULL string(12) "Ref1 changed" @@ -203,31 +203,31 @@ string(12) "Ref2 changed" ---- Pass by ref / pass by val: static method calls ---- -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d NULL string(11) "Ref changed" -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d NULL NULL -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d NULL string(11) "Ref changed" -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d string(11) "Ref changed" NULL string(12) "Ref1 changed" @@ -236,37 +236,37 @@ string(12) "Ref2 changed" ---- Pass by ref / pass by val: instance method calls ---- -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d NULL string(11) "Ref changed" -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d NULL string(11) "Ref changed" -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d NULL NULL -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d -Warning: Undefined variable: u1 in %s on line %d +Warning: Undefined variable $u1 in %s on line %d NULL string(11) "Ref changed" -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d -Warning: Undefined variable: u2 in %s on line %d +Warning: Undefined variable $u2 in %s on line %d string(11) "Ref changed" NULL string(12) "Ref1 changed" diff --git a/tests/lang/short_tags.004.phpt b/tests/lang/short_tags.004.phpt index 9bf73b064b..4111475e5e 100644 --- a/tests/lang/short_tags.004.phpt +++ b/tests/lang/short_tags.004.phpt @@ -29,6 +29,6 @@ This gets echoed twice <? $b=3; ?> -Warning: Undefined variable: b in %s on line %d +Warning: Undefined variable $b in %s on line %d -Warning: Undefined variable: b in %s on line %d +Warning: Undefined variable $b in %s on line %d |