diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-01 13:20:42 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-02 10:34:08 +0200 |
| commit | 2f92957fd3d8d87e73013c016e479451db0c6a1e (patch) | |
| tree | ca7d2d34038d7e1fb0e511962ad0db5e57390c63 | |
| parent | 2041c9abf5fdaa9d0e632e5e6e4f3488159c9bfe (diff) | |
| download | php-git-2f92957fd3d8d87e73013c016e479451db0c6a1e.tar.gz | |
Convert some notices to warnings
Part of https://wiki.php.net/rfc/engine_warnings.
261 files changed, 1273 insertions, 1110 deletions
@@ -97,7 +97,18 @@ PHP 8.0 UPGRADE NOTES * Attempting to write to an array index of a scalar value. * Attempting to unpack a non-array/Traversable. - RFC: Part of https://wiki.php.net/rfc/engine_warnings + A number of notices have been converted into warnings: + + * Attempting to read an undefined variable. + * Attempting to read an undefined property. + * Attempting to read a property of a non-object. + * Attempting to access an array index of a non-array. + * Attempting to convert an array to string. + * Attempting to use a resource as an array key. + * Attempting to use null, a boolean or a float as a string offset. + * Attempting to read an out-of-bounds string offset. + + RFC: https://wiki.php.net/rfc/engine_warnings - COM: . Removed the ability to import case-insensitive constants from type diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index cde590734f..819fdc2c2b 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -368,7 +368,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -380,7 +380,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -392,7 +392,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -404,7 +404,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -416,7 +416,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -428,7 +428,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -440,7 +440,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -452,7 +452,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -464,7 +464,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -476,7 +476,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -488,7 +488,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -500,7 +500,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -512,7 +512,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -524,7 +524,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -536,7 +536,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -548,7 +548,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -560,7 +560,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -572,7 +572,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -584,7 +584,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -596,7 +596,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -608,7 +608,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -620,7 +620,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -632,7 +632,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -644,7 +644,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -656,7 +656,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -668,7 +668,7 @@ bool(true) bool(true) bool(false) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -680,7 +680,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: scalar_var in %s on line %d +Warning: Undefined variable: scalar_var in %s on line %d NULL bool(false) bool(false) @@ -697,7 +697,7 @@ bool(true) bool(true) bool(true) -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -713,18 +713,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -740,18 +740,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -767,18 +767,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -794,18 +794,18 @@ bool(true) array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -827,13 +827,13 @@ array(3) { int(4) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(3) { [1]=> @@ -851,13 +851,13 @@ array(2) { int(4) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(2) { [2]=> @@ -871,13 +871,13 @@ array(1) { int(4) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [3]=> @@ -887,18 +887,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -918,13 +918,13 @@ array(2) { float(5.6) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(2) { [1]=> @@ -938,13 +938,13 @@ array(1) { float(5.6) } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [2]=> @@ -954,18 +954,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -983,13 +983,13 @@ array(1) { string(3) "two" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [2]=> @@ -999,18 +999,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -1028,13 +1028,13 @@ array(1) { string(2) "30" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { ["Age"]=> @@ -1044,18 +1044,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -1079,13 +1079,13 @@ array(4) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(4) { [1]=> @@ -1107,13 +1107,13 @@ array(3) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(3) { ["One"]=> @@ -1131,13 +1131,13 @@ array(2) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(2) { [2]=> @@ -1151,13 +1151,13 @@ array(1) { string(0) "" } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(1) { [""]=> @@ -1167,18 +1167,18 @@ array(1) { array(0) { } -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(false) -Notice: Undefined variable: key_val in %s on line %d +Warning: Undefined variable: key_val in %s on line %d bool(true) array(0) { } -Notice: Undefined variable: array_var in %s on line %d +Warning: Undefined variable: array_var in %s on line %d NULL bool(false) bool(false) @@ -1196,7 +1196,7 @@ bool(true) bool(false) bool(false) -Notice: 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) @@ -1209,10 +1209,10 @@ bool(true) bool(false) bool(false) -Notice: Undefined variable: resource in %s on line %d +Warning: Undefined variable: resource in %s on line %d NULL -Notice: Undefined variable: resources in %s on line %d +Warning: Undefined variable: resources in %s on line %d NULL bool(false) bool(true) @@ -1229,16 +1229,16 @@ object(Point)#%d (3) { bool(true) bool(false) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(false) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(true) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(false) -Notice: Undefined variable: lable in %s on line %d +Warning: Undefined variable: lable in %s on line %d bool(true) object(Point)#%d (3) { ["x"]=> @@ -1263,7 +1263,7 @@ bool(false) bool(false) bool(true) -Notice: Undefined variable: point1 in %s on line %d +Warning: Undefined variable: point1 in %s on line %d NULL bool(false) bool(true) @@ -1293,7 +1293,7 @@ value of static_var before unset: 1 bool(true) bool(false) -Notice: 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) @@ -1302,7 +1302,7 @@ value of static_var before unset: 2 bool(true) bool(false) -Notice: 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) @@ -1311,7 +1311,7 @@ value of static_var before unset: 3 bool(true) bool(false) -Notice: 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 9e647d4231..d4e34972ee 100644 --- a/Zend/tests/024.phpt +++ b/Zend/tests/024.phpt @@ -15,43 +15,43 @@ var_dump($a->$b->{$c[1]}); ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d -Notice: 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 NULL -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d -Notice: Undefined variable: c in %s on line %d +Warning: Undefined variable: c in %s on line %d -Notice: 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 NULL -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d int(1) -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d int(0) -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d int(1) -Notice: Trying to get property '1' of non-object in %s on line %d +Warning: Trying to get property '1' of non-object in %s on line %d NULL -Notice: Trying to get property '1' of non-object in %s on line %d +Warning: Trying to get property '1' of non-object in %s on line %d NULL -Notice: Undefined variable: c in %s on line %d +Warning: Undefined variable: c in %s on line %d -Notice: 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 -Notice: Trying to get property '1' of non-object in %s on line %d +Warning: Trying to get property '1' of non-object in %s on line %d -Notice: Trying to get property '' of non-object in %s on line %d +Warning: Trying to get property '' of non-object in %s on line %d NULL diff --git a/Zend/tests/026.phpt b/Zend/tests/026.phpt index 438fe8531d..0524487c5f 100644 --- a/Zend/tests/026.phpt +++ b/Zend/tests/026.phpt @@ -22,7 +22,7 @@ print "ok\n"; ?> --EXPECTF-- -Notice: Trying to get property 'a' of non-object in %s on line %d +Warning: Trying to get property 'a' of non-object in %s on line %d ok Attempt to assign property 'a' of non-object ok diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt index 0435767dd5..652db2de20 100644 --- a/Zend/tests/033.phpt +++ b/Zend/tests/033.phpt @@ -25,42 +25,42 @@ try { ?> --EXPECTF-- -Notice: Undefined variable: arr in %s on line %d +Warning: Undefined variable: arr in %s on line %d -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: Undefined variable: arr in %s on line %d +Warning: Undefined variable: arr in %s on line %d -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: Undefined variable: arr in %s on line %d +Warning: Undefined variable: arr in %s on line %d -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: Trying to get property 'foo' of non-object in %s on line %d +Warning: Trying to get property 'foo' of non-object in %s on line %d Attempt to assign property 'foo' of non-object Attempt to assign property 'bar' of non-object diff --git a/Zend/tests/array_unpack/undef_var.phpt b/Zend/tests/array_unpack/undef_var.phpt index fff1f6171e..945717db76 100644 --- a/Zend/tests/array_unpack/undef_var.phpt +++ b/Zend/tests/array_unpack/undef_var.phpt @@ -6,9 +6,9 @@ array unpacking with undefinded variable var_dump([...$arr]); --EXPECTF-- -Notice: 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: #0 {main} - thrown in %s on line %d
\ No newline at end of file + thrown in %s on line %d diff --git a/Zend/tests/arrow_functions/002.phpt b/Zend/tests/arrow_functions/002.phpt index 52c8020c19..76254fc69a 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-- -Notice: 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 5e77743fad..4e6998c9d1 100644 --- a/Zend/tests/arrow_functions/003.phpt +++ b/Zend/tests/arrow_functions/003.phpt @@ -14,8 +14,8 @@ var_dump($fn()); ?> --EXPECTF-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL -Notice: Undefined variable: 5 in %s on line %d +Warning: Undefined variable: 5 in %s on line %d NULL diff --git a/Zend/tests/assign_to_var_003.phpt b/Zend/tests/assign_to_var_003.phpt index bbe1b372bb..3ecf89e172 100644 --- a/Zend/tests/assign_to_var_003.phpt +++ b/Zend/tests/assign_to_var_003.phpt @@ -13,7 +13,7 @@ var_dump($var1); echo "Done\n"; ?> --EXPECTF-- -Notice: Trying to access array offset on value of type float in %s on line %d +Warning: Trying to access array offset on value of type float in %s on line %d NULL NULL Done diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt index 60f08a6df2..f1706cabb7 100644 --- a/Zend/tests/bug29674.phpt +++ b/Zend/tests/bug29674.phpt @@ -33,7 +33,7 @@ $obj->printVars(); ===BASE=== string(4) "Base" -Notice: Undefined property: BaseClass::$private_child in %sbug29674.php on line %d +Warning: Undefined property: BaseClass::$private_child in %s on line %d NULL ===CHILD=== string(4) "Base" diff --git a/Zend/tests/bug29689.phpt b/Zend/tests/bug29689.phpt index 12b3430089..16f80440d4 100644 --- a/Zend/tests/bug29689.phpt +++ b/Zend/tests/bug29689.phpt @@ -52,7 +52,7 @@ $baz->printFoo(); --EXPECTF-- foo: foo foo2 bar: bar -Notice: Undefined property: bar::$foo2 in %s on line %d +Warning: Undefined property: bar::$foo2 in %s on line %d ---baz-- foo: foo foo2 diff --git a/Zend/tests/bug29883.phpt b/Zend/tests/bug29883.phpt index 4e07b02d10..d9e1ae43b1 100644 --- a/Zend/tests/bug29883.phpt +++ b/Zend/tests/bug29883.phpt @@ -15,7 +15,7 @@ bool(false) bool(true) bool(true) -Notice: Uninitialized string offset: -10 in %s on line 6 +Warning: Uninitialized string offset: -10 in %s on line %d string(0) "" string(1) "u" string(1) "u" diff --git a/Zend/tests/bug29896.phpt b/Zend/tests/bug29896.phpt index d6ae8e7f7f..6b96ac4704 100644 --- a/Zend/tests/bug29896.phpt +++ b/Zend/tests/bug29896.phpt @@ -22,6 +22,6 @@ function GenerateError2($A1) GenerateError2("Test2"); ?> --EXPECTF-- -#0 userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11) called at [%sbug29896.php:11] +#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 55d26a3e3a..cd0ca4872e 100644 --- a/Zend/tests/bug30162.phpt +++ b/Zend/tests/bug30162.phpt @@ -43,7 +43,7 @@ var_dump($db); ?> ===DONE=== --EXPECTF-- -Notice: Undefined variable: db in %sbug30162.php on line 35 +Warning: Undefined variable: db in %s on line %d NULL object(hariCow)#%d (2) { ["x"]=> diff --git a/Zend/tests/bug31098.phpt b/Zend/tests/bug31098.phpt index 1849528231..3276782c01 100644 --- a/Zend/tests/bug31098.phpt +++ b/Zend/tests/bug31098.phpt @@ -44,7 +44,7 @@ ok ok ok -Notice: Trying to get property 'wrong' of non-object in %s on line %d +Warning: Trying to get property 'wrong' of non-object in %s on line %d ok Warning: Illegal string offset 'wrong' in %s on line %d diff --git a/Zend/tests/bug31720.phpt b/Zend/tests/bug31720.phpt index 9031dec030..b5e935cd80 100644 --- a/Zend/tests/bug31720.phpt +++ b/Zend/tests/bug31720.phpt @@ -12,6 +12,6 @@ try { ?> ===DONE=== --EXPECTF-- -Notice: Undefined variable: nonesuchvar in %s on line %d +Warning: Undefined variable: nonesuchvar in %s on line %d array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object ===DONE=== diff --git a/Zend/tests/bug39018.phpt b/Zend/tests/bug39018.phpt index a00e1fb819..43198b5c85 100644 --- a/Zend/tests/bug39018.phpt +++ b/Zend/tests/bug39018.phpt @@ -62,44 +62,44 @@ print "\nDone\n"; ?> --EXPECTF-- -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: %s in %s on line 6 +Warning: Uninitialized string offset: %s in %s on line %d -Notice: Uninitialized string offset: 0 in %s on line %d +Warning: Uninitialized string offset: 0 in %s on line %d -Notice: Uninitialized string offset: 0 in %s on line %d +Warning: Uninitialized string offset: 0 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: %i in %s on line %d +Warning: Uninitialized string offset: %i in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: %i in %s on line %d +Warning: Uninitialized string offset: %i in %s on line %d -Notice: Uninitialized string offset: 0 in %s on line %d +Warning: Uninitialized string offset: 0 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: Uninitialized string offset: 4 in %s on line %d +Warning: Uninitialized string offset: 4 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: 12 in %s on line %d +Warning: Uninitialized string offset: 12 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: Uninitialized string offset: 12 in %s on line %d +Warning: Uninitialized string offset: 12 in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d b Done diff --git a/Zend/tests/bug39036.phpt b/Zend/tests/bug39036.phpt index 419810eaa1..0cdd75150d 100644 --- a/Zend/tests/bug39036.phpt +++ b/Zend/tests/bug39036.phpt @@ -14,6 +14,6 @@ var_dump($key); echo "Done\n"; ?> --EXPECTF-- -Notice: Undefined variable: key in %s on line %d +Warning: Undefined variable: key in %s on line %d NULL Done diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt index 4394cae1d4..dc31073eb9 100644 --- a/Zend/tests/bug39304.phpt +++ b/Zend/tests/bug39304.phpt @@ -7,6 +7,6 @@ Bug #39304 (Segmentation fault with list unpacking of string offset) var_dump($a,$b); ?> --EXPECTF-- -Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d +Warning: Uninitialized string offset: 0 in %s on line %d NULL NULL diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/bug41209.phpt index f61df73d20..da9f57163d 100644 --- a/Zend/tests/bug41209.phpt +++ b/Zend/tests/bug41209.phpt @@ -41,6 +41,6 @@ echo "Done\n"; --EXPECTF-- Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d Stack trace: -#0 %s(%d): env::errorHandler(8, '%s', '%s', 34) +#0 %s(%d): env::errorHandler(2, 'Undefined varia...', '%s', %d) #1 {main} thrown in %s on line %d diff --git a/Zend/tests/bug43201.phpt b/Zend/tests/bug43201.phpt index 2ab26ca4b9..fa14b162d4 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 -Notice: Undefined variable: ref in %sbug43201.php on line 14 +Warning: Undefined variable: ref in %s on line %d -Notice: Undefined variable: undef in %sbug43201.php on line 16 +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 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +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 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +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 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +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 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +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 -Notice: Undefined variable: undef in %sbug43201.php on line 16 +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/bug44660.phpt b/Zend/tests/bug44660.phpt index bc7447325b..fbe4a90dcd 100644 --- a/Zend/tests/bug44660.phpt +++ b/Zend/tests/bug44660.phpt @@ -48,7 +48,7 @@ var_dump($a); ?> --EXPECTF-- --> read access: -Notice: Trying to get property 'p' of non-object in %s on line %d +Warning: Trying to get property 'p' of non-object in %s on line %d --> direct assignment: Attempt to assign property 'p' of non-object diff --git a/Zend/tests/bug44899.phpt b/Zend/tests/bug44899.phpt index d62033a24e..d9c0de0ef7 100644 --- a/Zend/tests/bug44899.phpt +++ b/Zend/tests/bug44899.phpt @@ -34,5 +34,5 @@ echo "\n"; isset empty -Notice: Undefined property: myclass::$foo in %s on line %d +Warning: Undefined property: myclass::$foo in %s on line %d empty diff --git a/Zend/tests/bug47109.phpt b/Zend/tests/bug47109.phpt index 0b86a2bcd3..4f8f4b9328 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-- -Notice: Undefined variable: a in %sbug47109.php on line 2 +Warning: Undefined variable: a in %s on line %d -Notice: Trying to get property 'ab' of non-object in %sbug47109.php on line 2 +Warning: Trying to get property 'ab' of non-object in %s on line %d diff --git a/Zend/tests/bug51394.phpt b/Zend/tests/bug51394.phpt index f91d2720a1..e31bc230cd 100644 --- a/Zend/tests/bug51394.phpt +++ b/Zend/tests/bug51394.phpt @@ -15,6 +15,6 @@ $a = $empty($b); --EXPECTF-- Fatal error: Uncaught Exception: error! in %sbug51394.php:%d Stack trace: -#0 %sbug51394.php(%d): eh(8, 'Undefined varia%s', '%s', %d) +#0 %s(%d): eh(2, 'Undefined varia...', '%s', %d) #1 {main} thrown in %sbug51394.php on line %d diff --git a/Zend/tests/bug52001.phpt b/Zend/tests/bug52001.phpt index cf55d195b9..36170eb96b 100644 --- a/Zend/tests/bug52001.phpt +++ b/Zend/tests/bug52001.phpt @@ -11,7 +11,7 @@ var_dump($temp1); function a($b,$c) {} ?> --EXPECTF-- -Notice: Undefined variable: var in %sbug52001.php on line 2 +Warning: Undefined variable: var in %s on line %d -Notice: Undefined variable: in %sbug52001.php on line 2 +Warning: Undefined variable: in %s on line %d int(1) diff --git a/Zend/tests/bug52041.phpt b/Zend/tests/bug52041.phpt index d7b2fd6caf..467a29fe77 100644 --- a/Zend/tests/bug52041.phpt +++ b/Zend/tests/bug52041.phpt @@ -47,47 +47,47 @@ foo()[0][0] += 2; var_dump(foo()); ?> --EXPECTF-- -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d -Notice: 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 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 -Notice: 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 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 -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d NULL diff --git a/Zend/tests/bug60536_001.phpt b/Zend/tests/bug60536_001.phpt index 0847b81d40..b4630f4b87 100644 --- a/Zend/tests/bug60536_001.phpt +++ b/Zend/tests/bug60536_001.phpt @@ -22,5 +22,5 @@ $a->__construct(); echo "DONE"; ?> --EXPECTF-- -Notice: Undefined property: Z::$x in %s on line 14 +Warning: Undefined property: Z::$x in %s on line %d DONE diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/bug63462.phpt index 45c9507bba..bcc2c67997 100644 --- a/Zend/tests/bug63462.phpt +++ b/Zend/tests/bug63462.phpt @@ -52,16 +52,16 @@ $test->privateProperty = 'value'; --EXPECTF-- __get nonExisting -Notice: Undefined property: Test::$nonExisting in %s on line %d +Warning: Undefined property: Test::$nonExisting in %s on line %d __get publicProperty -Notice: Undefined property: Test::$publicProperty in %s on line %d +Warning: Undefined property: Test::$publicProperty in %s on line %d __get protectedProperty -Notice: Undefined property: Test::$protectedProperty in %s on line %d +Warning: Undefined property: Test::$protectedProperty in %s on line %d __get privateProperty -Notice: Undefined property: Test::$privateProperty in %s on line %d +Warning: Undefined property: Test::$privateProperty in %s on line %d __isset nonExisting __isset publicProperty __isset protectedProperty diff --git a/Zend/tests/bug66609.phpt b/Zend/tests/bug66609.phpt index 206f7757d9..880f5a58a4 100644 --- a/Zend/tests/bug66609.phpt +++ b/Zend/tests/bug66609.phpt @@ -24,5 +24,5 @@ $foo->blah--; //crash echo "okey"; ?> --EXPECTF-- -Notice: Undefined property: Bar::$bar in %sbug66609.php on line %d +Warning: Undefined property: Bar::$bar in %s on line %d okey diff --git a/Zend/tests/bug67314.phpt b/Zend/tests/bug67314.phpt index c5b6a1293d..3ef225de03 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-- -Notice: Undefined variable: i in %sbug67314.php on line 4 +Warning: Undefined variable: i in %s on line %d made it once -Notice: Undefined variable: i in %sbug67314.php on line 4 +Warning: Undefined variable: i in %s on line %d ok diff --git a/Zend/tests/bug69732.phpt b/Zend/tests/bug69732.phpt index f5571627fe..578cb8d143 100644 --- a/Zend/tests/bug69732.phpt +++ b/Zend/tests/bug69732.phpt @@ -20,7 +20,7 @@ $wpq->interesting =& ret_assoc(); $x = $wpq->interesting; printf("%s\n", $x); --EXPECTF-- -Notice: Undefined property: wpq::$interesting in %sbug69732.php on line 6 +Warning: Undefined property: wpq::$interesting in %s on line %d Notice: Indirect modification of overloaded property wpq::$interesting has no effect in %sbug69732.php on line 16 diff --git a/Zend/tests/bug70124.phpt b/Zend/tests/bug70124.phpt index f32a8613fe..87ec4ab41d 100644 --- a/Zend/tests/bug70124.phpt +++ b/Zend/tests/bug70124.phpt @@ -39,7 +39,7 @@ try { } ?> --EXPECTF-- -Notice: Undefined variable: f in %sbug70124.php on line %d +Warning: Undefined variable: f in %s on line %d string(30) "Function name must be a string" string(31) "Call to undefined method A::y()" string(31) "Call to undefined method A::y()" diff --git a/Zend/tests/bug71300.phpt b/Zend/tests/bug71300.phpt index 3589c4764e..fc4b23681a 100644 --- a/Zend/tests/bug71300.phpt +++ b/Zend/tests/bug71300.phpt @@ -24,5 +24,5 @@ var_dump(test2()); --EXPECTF-- string(4) "test" -Notice: Array to string conversion in %sbug71300.php on line %d +Warning: Array to string conversion in %s on line %d string(9) "Arraytest" diff --git a/Zend/tests/bug72944.phpt b/Zend/tests/bug72944.phpt index 80b1544a55..0ddc99ff3b 100644 --- a/Zend/tests/bug72944.phpt +++ b/Zend/tests/bug72944.phpt @@ -7,5 +7,5 @@ define('e', 'e'); echo "OK\n"; ?> --EXPECTF-- -Notice: Undefined variable: A in %sbug72944.php on line 3 +Warning: Undefined variable: A in %s on line %d OK diff --git a/Zend/tests/bug74340.phpt b/Zend/tests/bug74340.phpt index f266dcc236..64d1b91b14 100644 --- a/Zend/tests/bug74340.phpt +++ b/Zend/tests/bug74340.phpt @@ -24,7 +24,7 @@ $test->test; --EXPECTF-- __get test -Notice: Undefined property: Test::$test in %s on line %d +Warning: Undefined property: Test::$test in %s on line %d __get test2 -Notice: Undefined property: Test::$test in %s on line %d +Warning: Undefined property: Test::$test in %s on line %d diff --git a/Zend/tests/bug75921.phpt b/Zend/tests/bug75921.phpt index 17cb496673..a8649262b5 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 -Notice: Undefined variable: null in %s on line %d +Warning: Undefined variable: null in %s on line %d NULL diff --git a/Zend/tests/bug76025.phpt b/Zend/tests/bug76025.phpt index c7958bd60e..903cec2607 100644 --- a/Zend/tests/bug76025.phpt +++ b/Zend/tests/bug76025.phpt @@ -13,6 +13,6 @@ $c = $b[$a]; --EXPECTF-- Fatal error: Uncaught Exception: blah in %sbug76025.php:%d Stack trace: -#0 %sbug76025.php(%d): handleError(8, 'Undefined varia...', '%s', %d) +#0 %s(%d): handleError(2, 'Undefined varia...', '%s', %d) #1 {main} thrown in %sbug76025.php on line %d diff --git a/Zend/tests/bug76667.phpt b/Zend/tests/bug76667.phpt index 15dc34693d..09f17b56c7 100644 --- a/Zend/tests/bug76667.phpt +++ b/Zend/tests/bug76667.phpt @@ -19,20 +19,20 @@ $x = new T; $x->x = 1; ?> --EXPECTF-- -Notice: Undefined variable: undefined in %sbug76667.php on line %d +Warning: Undefined variable: undefined in %s on line %d -Notice: Trying to get property '1' of non-object in %sbug76667.php 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 -Notice: Undefined variable: undefined in %sbug76667.php on line %d +Warning: Undefined variable: undefined in %s on line %d -Notice: Trying to get property 'NAN' of non-object in %sbug76667.php 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 -Notice: Undefined variable: undefined in %sbug76667.php on line %d +Warning: Undefined variable: undefined in %s on line %d -Notice: Trying to get property 'NAN' of non-object in %sbug76667.php 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 diff --git a/Zend/tests/bug76860.phpt b/Zend/tests/bug76860.phpt index 046edba7f2..67baa3996f 100644 --- a/Zend/tests/bug76860.phpt +++ b/Zend/tests/bug76860.phpt @@ -17,15 +17,15 @@ new B; --EXPECTF-- Notice: Accessing static property B::$a as non static in %sbug76860.php on line 7 -Notice: Undefined property: B::$a in %sbug76860.php on line 7 +Warning: Undefined property: B::$a in %s on line %d Notice: Accessing static property B::$b as non static in %sbug76860.php on line 7 -Notice: Undefined property: B::$b in %sbug76860.php on line 7 +Warning: Undefined property: B::$b in %s on line %d Notice: Accessing static property B::$c as non static in %sbug76860.php on line 7 -Notice: Undefined property: B::$c in %sbug76860.php on line 7 +Warning: Undefined property: B::$c in %s on line %d NULL NULL NULL diff --git a/Zend/tests/bug76860_2.phpt b/Zend/tests/bug76860_2.phpt index bc92702fc1..1ab85f69f2 100644 --- a/Zend/tests/bug76860_2.phpt +++ b/Zend/tests/bug76860_2.phpt @@ -20,15 +20,15 @@ new B; --EXPECTF-- Notice: Accessing static property B::$a as non static in %sbug76860_2.php on line 7 -Notice: Undefined property: B::$a in %sbug76860_2.php on line 7 +Warning: Undefined property: B::$a in %s on line %d Notice: Accessing static property B::$b as non static in %sbug76860_2.php on line 7 -Notice: Undefined property: B::$b in %sbug76860_2.php on line 7 +Warning: Undefined property: B::$b in %s on line %d Notice: Accessing static property B::$c as non static in %sbug76860_2.php on line 7 -Notice: Undefined property: B::$c in %sbug76860_2.php on line 7 +Warning: Undefined property: B::$c in %s on line %d NULL NULL NULL diff --git a/Zend/tests/bug77494.phpt b/Zend/tests/bug77494.phpt index 1793f6b219..adab05bef7 100644 --- a/Zend/tests/bug77494.phpt +++ b/Zend/tests/bug77494.phpt @@ -12,5 +12,5 @@ var_dump($a->name); --EXPECTF-- Warning: CURLFile() has been disabled for security reasons in %sbug77494.php on line 2 -Notice: Undefined property: CURLFile::$name in %sbug77494.php on line 3 +Warning: Undefined property: CURLFile::$name in %s on line %d NULL diff --git a/Zend/tests/bug78531.phpt b/Zend/tests/bug78531.phpt index e8614ffd11..1e8f0b34d1 100644 --- a/Zend/tests/bug78531.phpt +++ b/Zend/tests/bug78531.phpt @@ -24,14 +24,14 @@ try { } ?> --EXPECTF-- -Notice: 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 -Notice: 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 -Notice: 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 -Notice: 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 9d007a8af3..cc07ffab16 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() expects parameter 1 to be a valid callback, class 'foo' not found call_user_func() expects parameter 1 to be a valid callback, class '' not found -Notice: Undefined variable: foo in %s on line %d +Warning: Undefined variable: foo in %s on line %d call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object -Notice: Undefined variable: foo in %s on line %d +Warning: Undefined variable: foo in %s on line %d call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object diff --git a/Zend/tests/call_user_func_007.phpt b/Zend/tests/call_user_func_007.phpt index ed44320c3f..d3f2747c13 100644 --- a/Zend/tests/call_user_func_007.phpt +++ b/Zend/tests/call_user_func_007.phpt @@ -13,7 +13,7 @@ var_dump($a); --EXPECTF-- Notice: Undefined offset: 0 in %s on line %d -Notice: 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: Parameter 1 to foo() expected to be a reference, value given in %s on line %d array(0) { diff --git a/Zend/tests/cast_to_string.phpt b/Zend/tests/cast_to_string.phpt Binary files differindex b3d245f1ed..cdff53c38f 100644 --- a/Zend/tests/cast_to_string.phpt +++ b/Zend/tests/cast_to_string.phpt diff --git a/Zend/tests/class_properties_const.phpt b/Zend/tests/class_properties_const.phpt index 6f5471d20a..72b29519b4 100644 --- a/Zend/tests/class_properties_const.phpt +++ b/Zend/tests/class_properties_const.phpt @@ -13,13 +13,13 @@ var_dump($a->{1}); var_dump($a->{function(){}}); ?> --EXPECTF-- -Notice: Array to string conversion in %sclass_properties_const.php on line %d +Warning: Array to string conversion in %s on line %d runtime -Notice: Undefined property: A::$Array in %sclass_properties_const.php on line %d +Warning: Undefined property: A::$Array in %s on line %d NULL -Notice: Undefined property: A::$1 in %sclass_properties_const.php on line %d +Warning: Undefined property: A::$1 in %s on line %d NULL Fatal error: Uncaught Error: Object of class Closure could not be converted to string in %s:%d diff --git a/Zend/tests/clone_003.phpt b/Zend/tests/clone_003.phpt index 2dd376cf65..02ff350ca2 100644 --- a/Zend/tests/clone_003.phpt +++ b/Zend/tests/clone_003.phpt @@ -7,7 +7,7 @@ $a = clone $b; ?> --EXPECTF-- -Notice: 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 bae8f56878..f02045f5b1 100644 --- a/Zend/tests/closure_012.phpt +++ b/Zend/tests/closure_012.phpt @@ -16,8 +16,8 @@ $lambda(); var_dump($i); ?> --EXPECTF-- -Notice: Undefined variable: i in %sclosure_012.php on line 2 +Warning: Undefined variable: i in %s on line %d -Notice: Undefined variable: i in %sclosure_012.php on line 7 +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 76754f9fba..9fc29a4f18 100644 --- a/Zend/tests/closure_027.phpt +++ b/Zend/tests/closure_027.phpt @@ -27,7 +27,7 @@ object(stdClass)#%d (0) { } NULL -Notice: 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: Argument 1 passed to test() must be an instance of Closure, instance of stdClass given, called in %s on line %d and defined in %s:%d diff --git a/Zend/tests/closure_040.phpt b/Zend/tests/closure_040.phpt index 531ecb271a..a5f52e70b0 100644 --- a/Zend/tests/closure_040.phpt +++ b/Zend/tests/closure_040.phpt @@ -29,7 +29,7 @@ $cas->bindTo($a, 'A'); ?> --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: Class 'Array' not found in %s on line %d diff --git a/Zend/tests/concat_001.phpt b/Zend/tests/concat_001.phpt index 1e657954a9..b8fad29674 100644 --- a/Zend/tests/concat_001.phpt +++ b/Zend/tests/concat_001.phpt @@ -50,24 +50,24 @@ var_dump($d.$d); echo "Done\n"; ?> --EXPECTF-- -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(24) "Arraythis is test object" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(16) "Arraysome string" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(8) "Array222" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(13) "Array2323.444" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(10) "ArrayArray" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(24) "this is test objectArray" string(30) "this is test objectsome string" string(22) "this is test object222" @@ -75,20 +75,20 @@ string(27) "this is test object2323.444" string(38) "this is test objectthis is test object" string(30) "some stringthis is test object" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(16) "some stringArray" string(14) "some string222" string(19) "some string2323.444" string(22) "some stringsome string" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(8) "222Array" string(22) "222this is test object" string(14) "222some string" string(11) "2222323.444" string(6) "222222" -Notice: Array to string conversion in %sconcat_001.php on line %d +Warning: Array to string conversion in %s on line %d string(13) "2323.444Array" string(27) "2323.444this is test object" string(19) "2323.444some string" diff --git a/Zend/tests/dereference_002.phpt b/Zend/tests/dereference_002.phpt index 7290df7714..e17e5e85b6 100644 --- a/Zend/tests/dereference_002.phpt +++ b/Zend/tests/dereference_002.phpt @@ -70,7 +70,7 @@ array(2) { } int(1) -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL Notice: Undefined offset: 4 in %s on line %d diff --git a/Zend/tests/dereference_007.phpt b/Zend/tests/dereference_007.phpt index e7df6a422d..afe6e9d5b2 100644 --- a/Zend/tests/dereference_007.phpt +++ b/Zend/tests/dereference_007.phpt @@ -33,5 +33,5 @@ print "ok\n"; ?> --EXPECTF-- -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d ok diff --git a/Zend/tests/dereference_010.phpt b/Zend/tests/dereference_010.phpt index c63f6acaf9..c916352afa 100644 --- a/Zend/tests/dereference_010.phpt +++ b/Zend/tests/dereference_010.phpt @@ -21,10 +21,10 @@ var_dump(b()[1]); ?> --EXPECTF-- -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL Fatal error: Uncaught Error: Cannot use object of type stdClass as array in %s:%d diff --git a/Zend/tests/dereference_014.phpt b/Zend/tests/dereference_014.phpt index 189dca7a38..470c233a19 100644 --- a/Zend/tests/dereference_014.phpt +++ b/Zend/tests/dereference_014.phpt @@ -27,12 +27,12 @@ var_dump($h); ?> --EXPECTF-- -Notice: 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 -Notice: Trying to get property 'a' of non-object in %s on line %d +Warning: Trying to get property 'a' of non-object in %s on line %d NULL -Notice: 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 -Notice: Trying to get property 'b' of non-object in %s on line %d +Warning: Trying to get property 'b' of non-object in %s on line %d NULL diff --git a/Zend/tests/dynamic_call_004.phpt b/Zend/tests/dynamic_call_004.phpt index 2f444b3ee6..9028b1c801 100644 --- a/Zend/tests/dynamic_call_004.phpt +++ b/Zend/tests/dynamic_call_004.phpt @@ -7,7 +7,7 @@ $a::$b(); ?> --EXPECTF-- -Notice: 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 ffc3147f1c..45c3302fc0 100644 --- a/Zend/tests/entry_block_with_predecessors.phpt +++ b/Zend/tests/entry_block_with_predecessors.phpt @@ -28,6 +28,6 @@ test2(); ?> --EXPECTF-- -Notice: 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 5a4deadb59..6311eb30e5 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" -Notice: 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 f344e9557b..b4fbbecca8 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-- -Notice: 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 5b476cdf7f..7cd555716a 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-- -Notice: 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 6ea76fda3e..9c1a7c48d6 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-- -Notice: Undefined variable: undef_value in %s on line %d +Warning: Undefined variable: undef_value in %s on line %d -Notice: 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 32cb6b8d16..868c879160 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-- -Notice: 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 3d723f36c0..287c25460f 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-- -Notice: Undefined variable: blah in %s on line %d +Warning: Undefined variable: blah in %s on line %d -Notice: 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/foreach_undefined.phpt b/Zend/tests/foreach_undefined.phpt index aa4a160e6c..bc1d8bbc71 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-- -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d Warning: Invalid argument supplied for foreach() in %s on line %d Done diff --git a/Zend/tests/get_class_vars_002.phpt b/Zend/tests/get_class_vars_002.phpt index 23531e458d..475545ffe7 100644 --- a/Zend/tests/get_class_vars_002.phpt +++ b/Zend/tests/get_class_vars_002.phpt @@ -41,9 +41,9 @@ array(3) { int(6) } -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d -Notice: Undefined property: C::$c in %s on line %d +Warning: Undefined property: C::$c in %s on line %d int(1) NULL NULL diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt index 9a9c5401fe..821f345b81 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 -Notice: 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 d57e350092..f2f53a13f5 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 -Notice: 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 cdd4d211af..24e8edd8aa 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 -Notice: 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 0f2f7f0764..9ba3866835 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 -Notice: Undefined variable: _SERVER in %s on line %d +Warning: Undefined variable: _SERVER in %s on line %d NULL Done diff --git a/Zend/tests/indexing_001.phpt b/Zend/tests/indexing_001.phpt index a659d66141..453b5ca86f 100644 --- a/Zend/tests/indexing_001.phpt +++ b/Zend/tests/indexing_001.phpt @@ -79,12 +79,12 @@ array(1) { Warning: Illegal string offset 'foo' in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(1) "A" Warning: Illegal string offset 'foo' in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(1) "A" Cannot use a scalar value as an array float(0.1) diff --git a/Zend/tests/inference_infinite_loop.phpt b/Zend/tests/inference_infinite_loop.phpt index 1e94ea8040..ffa5cdbf89 100644 --- a/Zend/tests/inference_infinite_loop.phpt +++ b/Zend/tests/inference_infinite_loop.phpt @@ -14,4 +14,4 @@ test(); ?> --EXPECTF-- -Notice: 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 06cbe3d51d..c80a174daf 100644 --- a/Zend/tests/isset_003.phpt +++ b/Zend/tests/isset_003.phpt @@ -29,13 +29,13 @@ bool(true) bool(false) bool(false) -Notice: Undefined variable: c in %s on line %d +Warning: Undefined variable: c in %s on line %d -Notice: Undefined variable: d in %s on line %d +Warning: Undefined variable: d in %s on line %d -Notice: 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 -Notice: Trying to get property '' of non-object in %s on line %d +Warning: Trying to get property '' of non-object in %s on line %d bool(false) bool(true) bool(false) diff --git a/Zend/tests/list_keyed_conversions.phpt b/Zend/tests/list_keyed_conversions.phpt index bf0349b327..1dd48de9f2 100644 --- a/Zend/tests/list_keyed_conversions.phpt +++ b/Zend/tests/list_keyed_conversions.phpt @@ -29,6 +29,6 @@ int(1) int(0) int(1) -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d Notice: Undefined offset: 1 in %s on line %d diff --git a/Zend/tests/method_argument_binding.phpt b/Zend/tests/method_argument_binding.phpt index dea12621a3..32acd93c63 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) -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/Zend/tests/offset_array.phpt b/Zend/tests/offset_array.phpt index 00e6cb05e7..97b6a06b1c 100644 --- a/Zend/tests/offset_array.phpt +++ b/Zend/tests/offset_array.phpt @@ -44,7 +44,7 @@ NULL int(2) int(1) -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d int(%d) Illegal offset type Illegal offset type diff --git a/Zend/tests/offset_bool.phpt b/Zend/tests/offset_bool.phpt index 8ed9f28e43..ae8df6d2b5 100644 --- a/Zend/tests/offset_bool.phpt +++ b/Zend/tests/offset_bool.phpt @@ -25,30 +25,30 @@ var_dump($bool[$arr]); echo "Done\n"; ?> --EXPECTF-- -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL -Notice: Trying to access array offset on value of type bool in %s on line %d +Warning: Trying to access array offset on value of type bool in %s on line %d NULL Done diff --git a/Zend/tests/offset_long.phpt b/Zend/tests/offset_long.phpt index 4c6b3972d2..17dfe0d29b 100644 --- a/Zend/tests/offset_long.phpt +++ b/Zend/tests/offset_long.phpt @@ -25,30 +25,30 @@ var_dump($long[$arr]); echo "Done\n"; ?> --EXPECTF-- -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL -Notice: Trying to access array offset on value of type int in %s on line %d +Warning: Trying to access array offset on value of type int in %s on line %d NULL Done diff --git a/Zend/tests/offset_null.phpt b/Zend/tests/offset_null.phpt index ad0b1f3049..ae02eece77 100644 --- a/Zend/tests/offset_null.phpt +++ b/Zend/tests/offset_null.phpt @@ -25,30 +25,30 @@ var_dump($null[$arr]); echo "Done\n"; ?> --EXPECTF-- -Notice: 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 NULL -Notice: 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 NULL -Notice: 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 NULL -Notice: 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 NULL -Notice: 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 NULL -Notice: 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 NULL -Notice: 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 NULL -Notice: 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 NULL -Notice: 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 NULL Done diff --git a/Zend/tests/offset_string.phpt b/Zend/tests/offset_string.phpt index 01b0815ea0..1a9667cb8f 100644 --- a/Zend/tests/offset_string.phpt +++ b/Zend/tests/offset_string.phpt @@ -42,10 +42,10 @@ echo "Done\n"; --EXPECTF-- string(1) "i" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "S" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "S" Warning: Illegal string offset 'run away' in %s on line %d @@ -58,10 +58,10 @@ string(1) "o" Notice: A non well formed numeric value encountered in %s on line %d string(1) "r" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "i" -Notice: String offset cast occurred in %s on line %d +Warning: String offset cast occurred in %s on line %d string(1) "S" Illegal offset type diff --git a/Zend/tests/result_unused.phpt b/Zend/tests/result_unused.phpt index 12892e8415..263755beb0 100644 --- a/Zend/tests/result_unused.phpt +++ b/Zend/tests/result_unused.phpt @@ -24,5 +24,5 @@ $x->prop; $x->y; echo "ok\n"; --EXPECTF-- -Notice: Uninitialized string offset: 3 in %sresult_unused.php on line %d +Warning: Uninitialized string offset: 3 in %s on line %d ok diff --git a/Zend/tests/settype_string.phpt b/Zend/tests/settype_string.phpt Binary files differindex 3a2d59ecae..0c97450051 100644 --- a/Zend/tests/settype_string.phpt +++ b/Zend/tests/settype_string.phpt diff --git a/Zend/tests/str_offset_001.phpt b/Zend/tests/str_offset_001.phpt index 3317674857..04fadd3023 100644 --- a/Zend/tests/str_offset_001.phpt +++ b/Zend/tests/str_offset_001.phpt @@ -28,19 +28,19 @@ string(1) "a" string(1) "b" string(1) "c" -Notice: Uninitialized string offset: 3 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 3 in %s on line %d string(0) "" string(1) "b" -Notice: Uninitialized string offset: 1 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 1 in %s on line %d string(0) "" string(1) "a" string(1) "b" string(1) "c" -Notice: Uninitialized string offset: 3 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 3 in %s on line %d string(0) "" string(1) "b" -Notice: Uninitialized string offset: 1 in %sstr_offset_001.php on line %d +Warning: Uninitialized string offset: 1 in %s on line %d string(0) "" diff --git a/Zend/tests/str_offset_003.phpt b/Zend/tests/str_offset_003.phpt index e357ac0c01..4101ce522a 100644 --- a/Zend/tests/str_offset_003.phpt +++ b/Zend/tests/str_offset_003.phpt @@ -20,18 +20,18 @@ foo($str[2][-2]); foo($str[2][-1]); ?> --EXPECTF-- -Notice: Uninitialized string offset: -10 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -10 in %s on line %d string(0) "" string(1) "d" -Notice: Uninitialized string offset: -2 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -2 in %s on line %d string(0) "" string(1) "c" -Notice: Uninitialized string offset: -10 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -10 in %s on line %d string(0) "" string(1) "d" -Notice: Uninitialized string offset: -2 in %sstr_offset_003.php on line %d +Warning: Uninitialized string offset: -2 in %s on line %d string(0) "" string(1) "c" diff --git a/Zend/tests/strict_001.phpt b/Zend/tests/strict_001.phpt index 3fcaa8c2bc..54c5a76c48 100644 --- a/Zend/tests/strict_001.phpt +++ b/Zend/tests/strict_001.phpt @@ -14,6 +14,6 @@ var_dump($array[$fp]); echo "Done\n"; ?> --EXPECTF-- -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d int(%d) Done diff --git a/Zend/tests/this_in_extract.phpt b/Zend/tests/this_in_extract.phpt index 9903d7d794..ef0a25a279 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 -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL diff --git a/Zend/tests/type_declarations/typed_properties_103.phpt b/Zend/tests/type_declarations/typed_properties_103.phpt index 5c0fc85a99..f3f70bfa62 100644 --- a/Zend/tests/type_declarations/typed_properties_103.phpt +++ b/Zend/tests/type_declarations/typed_properties_103.phpt @@ -15,7 +15,7 @@ function foo() { foo(); ?> --EXPECTF-- -Notice: Undefined property: C::$a in %s on line %d +Warning: Undefined property: C::$a in %s on line %d object(C)#1 (1) { ["a"]=> int(2) diff --git a/Zend/tests/unset_cv01.phpt b/Zend/tests/unset_cv01.phpt index 99af118d10..508a0cbf3e 100644 --- a/Zend/tests/unset_cv01.phpt +++ b/Zend/tests/unset_cv01.phpt @@ -10,4 +10,4 @@ echo $x; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv01.php 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 cb2475350c..915b165eca 100644 --- a/Zend/tests/unset_cv02.phpt +++ b/Zend/tests/unset_cv02.phpt @@ -10,4 +10,4 @@ echo $x; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv02.php 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 221abe2d88..dce3fce5f1 100644 --- a/Zend/tests/unset_cv03.phpt +++ b/Zend/tests/unset_cv03.phpt @@ -10,4 +10,4 @@ echo $x; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv03.php 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 5044cb1c8d..816a5f9ce4 100644 --- a/Zend/tests/unset_cv04.phpt +++ b/Zend/tests/unset_cv04.phpt @@ -13,4 +13,4 @@ f(); --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv04.php on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/Zend/tests/unset_cv05.phpt b/Zend/tests/unset_cv05.phpt index 073ee4bee4..a389d651ad 100644 --- a/Zend/tests/unset_cv05.phpt +++ b/Zend/tests/unset_cv05.phpt @@ -17,6 +17,6 @@ echo $_SESSION; echo "\nok\n"; ?> --EXPECTF-- -Notice: Array to string conversion in %sunset_cv05.php on line %d +Warning: Array to string conversion in %s on line %d Array ok diff --git a/Zend/tests/unset_cv09.phpt b/Zend/tests/unset_cv09.phpt index a5407ad64e..a52062575c 100644 --- a/Zend/tests/unset_cv09.phpt +++ b/Zend/tests/unset_cv09.phpt @@ -10,5 +10,5 @@ echo "ok\n"; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv09.php 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 335463b0ca..97a79bb973 100644 --- a/Zend/tests/unset_cv10.phpt +++ b/Zend/tests/unset_cv10.phpt @@ -12,5 +12,5 @@ echo "ok\n"; --EXPECTF-- ok -Notice: Undefined variable: x in %sunset_cv10.php on line %d +Warning: Undefined variable: x in %s on line %d ok diff --git a/Zend/tests/varSyntax/propertyOfStringError.phpt b/Zend/tests/varSyntax/propertyOfStringError.phpt index 4fa50e7df0..446f1372cd 100644 --- a/Zend/tests/varSyntax/propertyOfStringError.phpt +++ b/Zend/tests/varSyntax/propertyOfStringError.phpt @@ -7,4 +7,4 @@ Cannot take property of a string ?> --EXPECTF-- -Notice: Trying to get property 'bar' of non-object in %s on line %d +Warning: Trying to get property 'bar' of non-object in %s on line %d diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index d180a83601..afa8804c9b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -264,7 +264,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_NOTICE, "Undefined variable: %s", ZSTR_VAL(cv)); + zend_error(E_WARNING, "Undefined variable: %s", ZSTR_VAL(cv)); } return &EG(uninitialized_zval); } @@ -1326,7 +1326,7 @@ try_again: case IS_NULL: case IS_FALSE: case IS_TRUE: - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); break; case IS_REFERENCE: dim = Z_REFVAL_P(dim); @@ -1456,7 +1456,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(z { zend_string *tmp_property_name; zend_string *property_name = zval_get_tmp_string(property, &tmp_property_name); - zend_error(E_NOTICE, "Trying to get property '%s' of non-object", ZSTR_VAL(property_name)); + zend_error(E_WARNING, "Trying to get property '%s' of non-object", ZSTR_VAL(property_name)); zend_tmp_string_release(tmp_property_name); } @@ -1894,7 +1894,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_cannot_add_element(vo static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_resource_as_offset(const zval *dim) { - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); } static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_use_new_element_for_string(void) @@ -2237,7 +2237,7 @@ try_string_offset: case IS_FALSE: case IS_TRUE: if (type != BP_VAR_IS) { - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); } break; case IS_REFERENCE: @@ -2255,7 +2255,7 @@ try_string_offset: if (UNEXPECTED(Z_STRLEN_P(container) < (size_t)((offset < 0) ? -offset : (offset + 1)))) { if (type != BP_VAR_IS) { - zend_error(E_NOTICE, "Uninitialized string offset: " ZEND_LONG_FMT, offset); + zend_error(E_WARNING, "Uninitialized string offset: " ZEND_LONG_FMT, offset); ZVAL_EMPTY_STRING(result); } else { ZVAL_NULL(result); @@ -2297,7 +2297,7 @@ try_string_offset: ZVAL_UNDEFINED_OP2(); } if (!is_list && type != BP_VAR_IS) { - zend_error(E_NOTICE, "Trying to access array offset on value of type %s", + zend_error(E_WARNING, "Trying to access array offset on value of type %s", zend_zval_type_name(container)); } ZVAL_NULL(result); @@ -3146,7 +3146,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_NOTICE,"Undefined variable: this"); + zend_error(E_WARNING, "Undefined variable: this"); } break; case BP_VAR_IS: diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index f60083d858..8a1898c227 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -777,7 +777,7 @@ call_getter: ZSTR_VAL(prop_info->ce->name), ZSTR_VAL(name)); } else { - zend_error(E_NOTICE,"Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); } } retval = &EG(uninitialized_zval); @@ -1009,7 +1009,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam UNEXPECTED((*zend_get_property_guard(zobj, name)) & IN_GET)) { if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) { ZVAL_NULL(retval); - zend_error(E_NOTICE, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); } } else { /* we do have getter - fail and let it try again with usual get/set */ @@ -1037,7 +1037,7 @@ ZEND_API zval *zend_std_get_property_ptr_ptr(zend_object *zobj, zend_string *nam /* Notice is thrown after creation of the property, to avoid EG(std_property_info) * being overwritten in an error handler. */ if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) { - zend_error(E_NOTICE, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); + zend_error(E_WARNING, "Undefined property: %s::$%s", ZSTR_VAL(zobj->ce->name), ZSTR_VAL(name)); } } } diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 04ee310f7a..7b4db44de8 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -559,7 +559,7 @@ try_again: break; } case IS_ARRAY: - zend_error(E_NOTICE, "Array to string conversion"); + zend_error(E_WARNING, "Array to string conversion"); zval_ptr_dtor(op); ZVAL_INTERNED_STR(op, ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED)); break; @@ -869,7 +869,7 @@ try_again: return zend_strpprintf(0, "%.*G", (int) EG(precision), Z_DVAL_P(op)); } case IS_ARRAY: - zend_error(E_NOTICE, "Array to string conversion"); + zend_error(E_WARNING, "Array to string conversion"); return (try && UNEXPECTED(EG(exception))) ? NULL : ZSTR_KNOWN(ZEND_STR_ARRAY_CAPITALIZED); case IS_OBJECT: { diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 3e83cccdf5..6fa82545e7 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1779,7 +1779,7 @@ ZEND_VM_C_LABEL(fetch_this): } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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 { @@ -1798,7 +1798,7 @@ ZEND_VM_C_LABEL(fetch_this): } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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 45f2986be4..6bd3add11c 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -8833,7 +8833,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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 { @@ -8852,7 +8852,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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 { @@ -16493,7 +16493,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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 { @@ -16512,7 +16512,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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 { @@ -45818,7 +45818,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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 { @@ -45837,7 +45837,7 @@ fetch_this: } else if (type == BP_VAR_IS) { retval = &EG(uninitialized_zval); } else { - zend_error(E_NOTICE,"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/date/tests/bug62500.phpt b/ext/date/tests/bug62500.phpt index 6952332014..3afa7a561b 100644 --- a/ext/date/tests/bug62500.phpt +++ b/ext/date/tests/bug62500.phpt @@ -23,6 +23,6 @@ try { NULL int(3) -Notice: Undefined property: Crasher::$2 in %sbug62500.php on line %d +Warning: Undefined property: Crasher::$2 in %s on line %d NULL string(%s) "DateInterval::__construct(): Unknown or bad format (blah)" diff --git a/ext/date/tests/bug74852.phpt b/ext/date/tests/bug74852.phpt index e293bef8bf..d5fea0ad3f 100644 --- a/ext/date/tests/bug74852.phpt +++ b/ext/date/tests/bug74852.phpt @@ -13,5 +13,5 @@ var_dump($interval->abcde); bool(false) bool(false) -Notice: Undefined property: DateInterval::$abcde in %s on line %d +Warning: Undefined property: DateInterval::$abcde in %s on line %d NULL diff --git a/ext/date/tests/bug75232.phpt b/ext/date/tests/bug75232.phpt index 9200f65e91..cf4f289465 100644 --- a/ext/date/tests/bug75232.phpt +++ b/ext/date/tests/bug75232.phpt @@ -14,7 +14,7 @@ echo $d2->date, "\n"; ?> --EXPECTF-- -Notice: Undefined property: DateTime::$date in %s on line %d +Warning: Undefined property: DateTime::$date in %s on line %d DateTime Object ( @@ -23,4 +23,4 @@ DateTime Object [timezone] => UTC ) -Notice: Undefined property: DateTime::$date in %s on line %d +Warning: Undefined property: DateTime::$date in %s on line %d diff --git a/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt b/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt index a7766541d5..e57c3da913 100644 --- a/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt +++ b/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt @@ -19,5 +19,5 @@ var_dump($attr->ownerElement); --EXPECTF-- Warning: Couldn't fetch DOMAttr. Node no longer exists in %s on line %d -Notice: Undefined property: DOMAttr::$ownerElement in %s on line %d +Warning: Undefined property: DOMAttr::$ownerElement in %s on line %d NULL diff --git a/ext/dom/tests/bug36756.phpt b/ext/dom/tests/bug36756.phpt index 4e47b86e4b..ccf9ba5049 100644 --- a/ext/dom/tests/bug36756.phpt +++ b/ext/dom/tests/bug36756.phpt @@ -31,5 +31,5 @@ child Warning: Couldn't fetch DOMElement. Node no longer exists in %sbug36756.php on line %d -Notice: Undefined property: DOMElement::$nodeType in %sbug36756.php on line %d +Warning: Undefined property: DOMElement::$nodeType in %s on line %d nodeType: diff --git a/ext/dom/tests/bug67949.phpt b/ext/dom/tests/bug67949.phpt index 304c3a91ee..c49f0e4e0e 100644 --- a/ext/dom/tests/bug67949.phpt +++ b/ext/dom/tests/bug67949.phpt @@ -62,7 +62,7 @@ bool(false) testing property access string(4) "data" -Notice: Trying to get property 'textContent' of non-object in %s on line %d +Warning: Trying to get property 'textContent' of non-object in %s on line %d NULL testing offset not a long array(1) { @@ -70,7 +70,7 @@ array(1) { string(4) "test" } -Notice: Trying to get property 'textContent' of non-object in %s on line %d +Warning: Trying to get property 'textContent' of non-object in %s on line %d bool(false) NULL array(1) { diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt index e5ba550910..a3aabf1427 100644 --- a/ext/intl/tests/dateformat_setTimeZone_error.phpt +++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt @@ -18,7 +18,7 @@ var_dump($df->setTimeZone('non existing timezone')); ?> ==DONE== --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'Array' in %s on line %d bool(false) diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt index 98aad5b591..f82ecf138a 100644 --- a/ext/libxml/tests/bug61367-read.phpt +++ b/ext/libxml/tests/bug61367-read.phpt @@ -4,7 +4,6 @@ Bug #61367: open_basedir bypass in libxml RSHUTDOWN: read test <?php if(!extension_loaded('dom')) echo 'skip dom extension not available'; ?> --INI-- open_basedir=. -error_reporting=E_ALL & ~E_NOTICE --FILE-- <?php /* @@ -58,3 +57,7 @@ Warning: DOMDocument::loadXML(): I/O warning : failed to load external entity "f Warning: DOMDocument::loadXML(): Failure to process entity file in Entity, line: 4 in %s on line %d Warning: DOMDocument::loadXML(): Entity 'file' not defined in Entity, line: 4 in %s on line %d + +Warning: Trying to get property 'firstChild' of non-object in %s on line %d + +Warning: Trying to get property 'nodeValue' of non-object in %s on line %d diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt index 13590bf5a9..7b920b4f4c 100644 --- a/ext/mysqli/tests/mysqli_options.phpt +++ b/ext/mysqli/tests/mysqli_options.phpt @@ -102,7 +102,7 @@ bool(true) %s(23) "MYSQLI_OPT_LOCAL_INFILE" bool(true) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d %s(19) "MYSQLI_INIT_COMMAND" bool(true) %s(25) "MYSQLI_READ_DEFAULT_GROUP" diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c index c626a14ad8..206066930d 100644 --- a/ext/opcache/jit/zend_jit_helpers.c +++ b/ext/opcache/jit/zend_jit_helpers.c @@ -220,7 +220,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_NOTICE, "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) @@ -250,7 +250,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim, hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -322,7 +322,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_is_helper(zend_array *ht, zval *dim hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -391,7 +391,7 @@ static int ZEND_FASTCALL zend_jit_fetch_dim_isset_helper(zend_array *ht, zval *d hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - //zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + //zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -458,7 +458,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_rw_helper(zend_array *ht, zval *di hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -526,7 +526,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_w_helper(zend_array *ht, zval *dim hval = zend_dval_to_lval(Z_DVAL_P(dim)); goto num_index; case IS_RESOURCE: - zend_error(E_NOTICE, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); + zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(dim), Z_RES_HANDLE_P(dim)); hval = Z_RES_HANDLE_P(dim); goto num_index; case IS_FALSE: @@ -584,7 +584,7 @@ try_string_offset: case IS_NULL: case IS_FALSE: case IS_TRUE: - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); break; case IS_REFERENCE: dim = Z_REFVAL_P(dim); @@ -600,7 +600,7 @@ try_string_offset: } if (UNEXPECTED(Z_STRLEN_P(container) < (size_t)((offset < 0) ? -offset : (offset + 1)))) { - zend_error(E_NOTICE, "Uninitialized string offset: " ZEND_LONG_FMT, offset); + zend_error(E_WARNING, "Uninitialized string offset: " ZEND_LONG_FMT, offset); ZVAL_EMPTY_STRING(result); } else { zend_uchar c; @@ -731,7 +731,7 @@ try_again: case IS_NULL: case IS_FALSE: case IS_TRUE: - zend_error(E_NOTICE, "String offset cast occurred"); + zend_error(E_WARNING, "String offset cast occurred"); break; case IS_REFERENCE: dim = Z_REFVAL_P(dim); @@ -1424,5 +1424,5 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg) static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container) { const char *type = Z_ISUNDEF_P(container) ? "null" : zend_zval_type_name(container); - zend_error(E_NOTICE, "Trying to access array offset on value of type %s", type); + zend_error(E_WARNING, "Trying to access array offset on value of type %s", type); } diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 5bda3f5980..ba3d4b36fe 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -2879,7 +2879,7 @@ static int zend_jit_inc_dec(dasm_State **Dst, const zend_op *opline, zend_op_arr | SAVE_VALID_OPLINE opline if (op1_info & MAY_BE_UNDEF) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >2 - | // zend_error(E_NOTICE, "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 @@ -4373,7 +4373,7 @@ static int zend_jit_simple_assign(dasm_State **Dst, |.cold_code |1: } - | // zend_error(E_NOTICE, "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 } @@ -6014,7 +6014,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "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 | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6029,7 +6029,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "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 | mov aword T1, FCARG1a // save | mov FCARG1d, opline->op2.var @@ -6048,7 +6048,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG1a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "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 | mov FCARG1d, opline->op1.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -6068,7 +6068,7 @@ static int zend_jit_identical(dasm_State **Dst, const zend_op *opline, int b, in | IF_Z_TYPE FCARG2a, IS_UNDEF, >1 |.cold_code |1: - | // zend_error(E_NOTICE, "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 | mov FCARG1d, opline->op2.var | EXT_CALL zend_jit_undefined_op_helper, r0 @@ -8535,7 +8535,7 @@ static int zend_jit_fetch_dim_read(dasm_State **Dst, const zend_op *opline, zend | SAVE_VALID_OPLINE opline if (opline->opcode != ZEND_FETCH_DIM_IS && (op1_info & MAY_BE_UNDEF)) { | IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >1 - | // zend_error(E_NOTICE, "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: @@ -9414,7 +9414,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, zend_op *opline, zend_op_ar |1: } |.if X64 - | mov CARG1, E_NOTICE + | mov CARG1, E_WARNING | LOAD_ADDR CARG2, "Trying to get property '%s' of non-object" | LOAD_ADDR CARG3, Z_STRVAL_P(member) | EXT_CALL zend_error, r0 @@ -9422,7 +9422,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, zend_op *opline, zend_op_ar | sub r4, 4 | push Z_STRVAL_P(member) | push "Trying to get property '%s' of non-object" - | push E_NOTICE + | push E_WARNING | EXT_CALL zend_error, r0 | add r4, 16 |.endif diff --git a/ext/opcache/tests/block_pass_001.phpt b/ext/opcache/tests/block_pass_001.phpt index c024b81ce8..7fab78bbe8 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-- -Notice: Undefined variable: x in %s on line %d +Warning: Undefined variable: x in %s on line %d diff --git a/ext/opcache/tests/bug73668.phpt b/ext/opcache/tests/bug73668.phpt index 379ba4a5ac..b2a0508aa5 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-- -Notice: 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 dfb676f4ba..98b1d3dc56 100644 --- a/ext/opcache/tests/bug76446.phpt +++ b/ext/opcache/tests/bug76446.phpt @@ -18,5 +18,5 @@ function test() var_dump(test()); ?> --EXPECTF-- -Notice: Undefined variable: addlang in %sbug76446.php 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 a1962b7ade..22a36d1e3d 100644 --- a/ext/opcache/tests/bug77058.phpt +++ b/ext/opcache/tests/bug77058.phpt @@ -18,5 +18,5 @@ myfunc(); ?> --EXPECTF-- -Notice: 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/bug78015.phpt b/ext/opcache/tests/bug78015.phpt index 0a03c9834f..aa4ba4db4b 100644 --- a/ext/opcache/tests/bug78015.phpt +++ b/ext/opcache/tests/bug78015.phpt @@ -103,7 +103,7 @@ array(1) { } bool(true) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(11) "Arrayfoobar" int(2) array(2) { diff --git a/ext/opcache/tests/jit/assign_022.phpt b/ext/opcache/tests/jit/assign_022.phpt index f054a6a4d7..ebe153f140 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-- -Notice: 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 3e18b19324..ebe5ff288f 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-- -Notice: 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 b0fc372139..4f48a3e75c 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-- -Notice: 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 402c923a5f..36b76dba09 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-- -Notice: 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_r_003.phpt b/ext/opcache/tests/jit/fetch_dim_r_003.phpt index 0c213802ce..2e82cb926c 100644 --- a/ext/opcache/tests/jit/fetch_dim_r_003.phpt +++ b/ext/opcache/tests/jit/fetch_dim_r_003.phpt @@ -34,18 +34,18 @@ foo(); string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 6 +Warning: String offset cast occurred in %s on line %d string(1) "B" string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 9 +Warning: String offset cast occurred in %s on line %d string(1) "A" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 10 +Warning: String offset cast occurred in %s on line %d string(1) "B" -Notice: String offset cast occurred in %sfetch_dim_r_003.php on line 11 +Warning: String offset cast occurred in %s on line %d string(1) "A" Warning: Illegal string offset 'ab' in %sfetch_dim_r_003.php on line 12 diff --git a/ext/opcache/tests/jit/fetch_dim_r_004.phpt b/ext/opcache/tests/jit/fetch_dim_r_004.phpt index 6f3c730a8d..66a88977d9 100644 --- a/ext/opcache/tests/jit/fetch_dim_r_004.phpt +++ b/ext/opcache/tests/jit/fetch_dim_r_004.phpt @@ -34,18 +34,18 @@ foo($x.$y); string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "B" string(1) "A" string(1) "C" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "A" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "B" -Notice: String offset cast occurred in %sfetch_dim_r_004.php on line 4 +Warning: String offset cast occurred in %s on line %d string(1) "A" Warning: Illegal string offset 'ab' in %sfetch_dim_r_004.php on line 4 diff --git a/ext/opcache/tests/jit/fetch_dim_rw_001.phpt b/ext/opcache/tests/jit/fetch_dim_rw_001.phpt index 9e883aaf75..a828e0a5ea 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-- -Notice: Undefined variable: a in %sfetch_dim_rw_001.php on line 3 +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/fetch_obj_002.phpt b/ext/opcache/tests/jit/fetch_obj_002.phpt index 95ad920ea8..463ff01b26 100644 --- a/ext/opcache/tests/jit/fetch_obj_002.phpt +++ b/ext/opcache/tests/jit/fetch_obj_002.phpt @@ -35,7 +35,7 @@ bar(); --EXPECTF-- int(2) -Notice: Undefined property: A::$y in %sfetch_obj_002.php on line 16 +Warning: Undefined property: A::$y in %s on line %d NULL int(3) string(5) "__get" diff --git a/ext/opcache/tests/jit/fetch_obj_003.phpt b/ext/opcache/tests/jit/fetch_obj_003.phpt index 3f7f0beaf3..9232ccd64b 100644 --- a/ext/opcache/tests/jit/fetch_obj_003.phpt +++ b/ext/opcache/tests/jit/fetch_obj_003.phpt @@ -31,13 +31,13 @@ foo(); bar(); ?> --EXPECTF-- -Notice: Undefined property: C::$a in %sfetch_obj_003.php on line 9 +Warning: Undefined property: C::$a in %s on line %d object(C)#1 (1) { ["a"]=> int(2) } -Notice: Undefined property: C::$a in %sfetch_obj_003.php on line 17 +Warning: Undefined property: C::$a in %s on line %d object(C)#1 (2) { ["a"]=> int(2) diff --git a/ext/opcache/tests/jmpz_jmp_elim.phpt b/ext/opcache/tests/jmpz_jmp_elim.phpt index 8a343512dd..434897bf80 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-- -Notice: 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 a7e4a11b76..c83a4efc36 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-- -Notice: Undefined variable: undef in %swrong_inlining_003.php on line 7 +Warning: Undefined variable: undef in %s on line %d int(42) diff --git a/ext/pcre/tests/bug44925.phpt b/ext/pcre/tests/bug44925.phpt index f6e0db4253..c495331b4b 100644 --- a/ext/pcre/tests/bug44925.phpt +++ b/ext/pcre/tests/bug44925.phpt @@ -45,11 +45,11 @@ array(9) { &string(1) "b" } -Notice: Array to string conversion in %sbug44925.php on line 9 +Warning: Array to string conversion in %s on line %d array(0) { } -Notice: Array to string conversion in %sbug44925.php on line 11 +Warning: Array to string conversion in %s on line %d array(7) { [0]=> string(1) "1" diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt index 79fcb98897..1bf23bb640 100644 --- a/ext/pcre/tests/preg_grep_error1.phpt +++ b/ext/pcre/tests/preg_grep_error1.phpt @@ -6,7 +6,6 @@ Test preg_grep() function : error conditions - bad regular expressions * proto array preg_grep(string regex, array input [, int flags]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_grep reacts to being passed bad regexes */ @@ -19,7 +18,7 @@ $values = array('abcdef', //Regex without delimiter ); $array = array(123, 'abc', 'test'); foreach($values as $value) { - print "\nArg value is $value\n"; + @print "\nArg value is $value\n"; try { var_dump(preg_grep($value, $array)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt index bd0f28c8c4..6a5a0055a9 100644 --- a/ext/pcre/tests/preg_match_all_error1.phpt +++ b/ext/pcre/tests/preg_match_all_error1.phpt @@ -6,7 +6,6 @@ Test preg_match_all() function : error conditions - bad regular expressions * proto int preg_match_all(string pattern, string subject, array subpatterns [, int flags [, int offset]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match_all reacts to being passed the wrong type of regex argument */ @@ -19,7 +18,7 @@ $regex_array = array('abcdef', //Regex without delimiter ); $subject = 'test'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; try { var_dump(preg_match_all($regex_value, $subject, $matches1)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_all_error2.phpt b/ext/pcre/tests/preg_match_all_error2.phpt index 8c52b73076..29762739c4 100644 --- a/ext/pcre/tests/preg_match_all_error2.phpt +++ b/ext/pcre/tests/preg_match_all_error2.phpt @@ -6,7 +6,6 @@ Test preg_match_all() function : error conditions - wrong arg types * proto int preg_match_all(string pattern, string subject, array subpatterns [, int flags [, int offset]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match_all reacts to being passed the wrong type of input argument */ @@ -14,7 +13,7 @@ echo "*** Testing preg_match_all() : error conditions ***\n"; $regex = '/[a-zA-Z]/'; $input = array(array('this is', 'a subarray'), 'test',); foreach($input as $value) { - print "\nArg value is: $value\n"; + @print "\nArg value is: $value\n"; try { var_dump(preg_match_all($regex, $value, $matches)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt index 23d6829c48..2f1b39d67f 100644 --- a/ext/pcre/tests/preg_match_error1.phpt +++ b/ext/pcre/tests/preg_match_error1.phpt @@ -6,7 +6,6 @@ Test preg_match() function : error conditions - bad regular expressions * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match reacts to being passed the wrong type of regex argument */ @@ -19,7 +18,7 @@ $regex_array = array('abcdef', //Regex without delimiter ); $subject = 'this is a test'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; try { var_dump(preg_match($regex_value, $subject)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt index 9530983e81..18a42c6445 100644 --- a/ext/pcre/tests/preg_match_error2.phpt +++ b/ext/pcre/tests/preg_match_error2.phpt @@ -6,7 +6,6 @@ Test preg_match() function : error conditions - wrong arg types * proto int preg_match(string pattern, string subject [, array subpatterns [, int flags [, int offset]]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_match reacts to being passed the wrong type of subject argument */ @@ -14,7 +13,7 @@ echo "*** Testing preg_match() : error conditions ***\n"; $regex = '/[a-zA-Z]/'; $input = array('this is a string', array('this is', 'a subarray'),); foreach($input as $value) { - print "\nArg value is: $value\n"; + @print "\nArg value is: $value\n"; try { var_dump(preg_match($regex, $value)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_replace_callback2.phpt b/ext/pcre/tests/preg_replace_callback2.phpt index 1fe78d59ee..6dab1a0cf2 100644 --- a/ext/pcre/tests/preg_replace_callback2.phpt +++ b/ext/pcre/tests/preg_replace_callback2.phpt @@ -31,7 +31,7 @@ array(3) { string(9) "'aa' 'bb'" } -Notice: Array to string conversion in %spreg_replace_callback2.php on line 17 +Warning: Array to string conversion in %s on line %d array(1) { [0]=> string(7) "'A'rray" diff --git a/ext/pcre/tests/preg_replace_callback_error1.phpt b/ext/pcre/tests/preg_replace_callback_error1.phpt index 313064eab8..cf069692e8 100644 --- a/ext/pcre/tests/preg_replace_callback_error1.phpt +++ b/ext/pcre/tests/preg_replace_callback_error1.phpt @@ -6,7 +6,6 @@ Test preg_replace_callback() function : error * proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_replace_callback reacts to being passed the wrong type of regex argument */ @@ -15,7 +14,7 @@ $regex_array = array('abcdef', //Regex without delimiters '/[a-zA-Z]', //Regex without closing delimiter '[a-zA-Z]/', //Regex without opening delimiter '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes -'[A-Z]', '[0-9]'), '/[a-zA-Z]/'); //Regex string +'[A-Z]', '[0-9]'), '/[0-9]/'); //Regex string $replacement = array('zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine'); function integer_word($matches) { global $replacement; @@ -23,7 +22,7 @@ function integer_word($matches) { } $subject = 'number 1.'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; var_dump(preg_replace_callback($regex_value, 'integer_word', $subject)); } ?> @@ -54,6 +53,6 @@ NULL Arg value is Array string(9) "number 1." -Arg value is /[a-zA-Z]/ -string(3) " 1." +Arg value is /[0-9]/ +string(11) "number one." ===Done=== diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt index 780556956a..669a5c6c4e 100644 --- a/ext/pcre/tests/preg_replace_error1.phpt +++ b/ext/pcre/tests/preg_replace_error1.phpt @@ -6,7 +6,6 @@ Test preg_replace() function : error - bad regular expressions * proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_replace reacts to being passed the wrong type of regex argument */ @@ -20,7 +19,7 @@ $regex_array = array('abcdef', //Regex without delimiter $replace = 1; $subject = 'a'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; var_dump(preg_replace($regex_value, $replace, $subject)); } $regex_value = new stdclass(); //Object diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt index 0a3ba3bb46..eeff2fae54 100644 --- a/ext/pcre/tests/preg_replace_error2.phpt +++ b/ext/pcre/tests/preg_replace_error2.phpt @@ -6,7 +6,6 @@ Test preg_replace() function : error conditions - wrong arg types * proto string preg_replace(mixed regex, mixed replace, mixed subject [, int limit [, count]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_replace reacts to being passed the wrong type of replacement argument */ @@ -15,7 +14,7 @@ $regex = '/[a-zA-Z]/'; $replace = array('this is a string', array('this is', 'a subarray'),); $subject = 'test'; foreach($replace as $value) { - print "\nArg value is: $value\n"; + @print "\nArg value is: $value\n"; try { var_dump(preg_replace($regex, $value, $subject)); } catch (TypeError $e) { diff --git a/ext/pcre/tests/preg_split_error1.phpt b/ext/pcre/tests/preg_split_error1.phpt index 1c1e3ec646..b69caf1aed 100644 --- a/ext/pcre/tests/preg_split_error1.phpt +++ b/ext/pcre/tests/preg_split_error1.phpt @@ -6,7 +6,6 @@ Test preg_split() function : error conditions - bad regular expressions * proto array preg_split(string pattern, string subject [, int limit [, int flags]]) * Function is implemented in ext/pcre/php_pcre.c */ -error_reporting(E_ALL&~E_NOTICE); /* * Testing how preg_split reacts to being passed the wrong type of regex argument */ @@ -19,7 +18,7 @@ $regex_array = array('abcdef', //Regex without delimiter ); $subject = '1 2 a 3 4 b 5 6'; foreach($regex_array as $regex_value) { - print "\nArg value is $regex_value\n"; + @print "\nArg value is $regex_value\n"; try { var_dump(preg_split($regex_value, $subject)); } catch (TypeError $e) { diff --git a/ext/pdo_mysql/tests/bug44327.phpt b/ext/pdo_mysql/tests/bug44327.phpt index 27a926295c..f457c97aeb 100644 --- a/ext/pdo_mysql/tests/bug44327.phpt +++ b/ext/pdo_mysql/tests/bug44327.phpt @@ -60,5 +60,5 @@ object(PDORow)#%d (2) { string(19) "SELECT id FROM test" ---------------------------------- -Notice: Trying to get property 'queryString' of non-object in %s on line %d +Warning: Trying to get property 'queryString' of non-object in %s on line %d NULL diff --git a/ext/pdo_sqlite/tests/bug43831.phpt b/ext/pdo_sqlite/tests/bug43831.phpt index 4620559da4..514b8c2b5f 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) { } -Notice: Undefined variable: bar in %s on line %d +Warning: Undefined variable: bar in %s on line %d NULL diff --git a/ext/reflection/tests/ReflectionClass_constructor_002.phpt b/ext/reflection/tests/ReflectionClass_constructor_002.phpt index 05825ba97e..7d8a312f51 100644 --- a/ext/reflection/tests/ReflectionClass_constructor_002.phpt +++ b/ext/reflection/tests/ReflectionClass_constructor_002.phpt @@ -51,7 +51,7 @@ Class does not exist Class 1 does not exist Class 1 does not exist -Notice: Array to string conversion in %s on line 27 +Warning: Array to string conversion in %s on line %d Class Array does not exist ReflectionClass::__construct() expects exactly 1 parameter, 2 given Class X does not exist diff --git a/ext/reflection/tests/ReflectionParameter_003.phpt b/ext/reflection/tests/ReflectionParameter_003.phpt index cc092bffcc..581c486f62 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 -Notice: Undefined variable: theIncrement in %s on line 8 +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 a50feb0cf0..b926de323e 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) -Notice: 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_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt index 4b2be79ff0..a947eab54e 100644 --- a/ext/session/tests/session_encode_error2.phpt +++ b/ext/session/tests/session_encode_error2.phpt @@ -246,7 +246,7 @@ bool(true) -- Iteration 24 -- bool(true) -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d Notice: session_encode(): Skipping numeric key %d in %s on line %d bool(false) 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 f0a9139ade..bbf125bc9a 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 -Notice: 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 28e0517651..c050ca2dd4 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-- -Notice: 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/simplexml/tests/bug38406.phpt b/ext/simplexml/tests/bug38406.phpt index ea92229496..51a716cbd3 100644 --- a/ext/simplexml/tests/bug38406.phpt +++ b/ext/simplexml/tests/bug38406.phpt @@ -27,7 +27,7 @@ object(SimpleXMLElement)#%d (1) { string(9) "something" } -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: It is not yet possible to assign complex types to properties in %s on line %d Done diff --git a/ext/spl/tests/SplFileObject_fputcsv_002.phpt b/ext/spl/tests/SplFileObject_fputcsv_002.phpt index fdd4112ee6..77f6d76bbf 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_002.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_002.phpt @@ -16,7 +16,7 @@ $file = __DIR__ . '/SplFileObject_fputcsv1.csv'; unlink($file); ?> --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(7) { [0]=> int(1) diff --git a/ext/spl/tests/arrayObject___construct_basic2.phpt b/ext/spl/tests/arrayObject___construct_basic2.phpt index 9295f40e51..ddbf074bf3 100644 --- a/ext/spl/tests/arrayObject___construct_basic2.phpt +++ b/ext/spl/tests/arrayObject___construct_basic2.phpt @@ -61,7 +61,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: ArrayObject::$prop in %s on line 40 +Warning: Undefined property: ArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL @@ -89,7 +89,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: MyArrayObject::$prop in %s on line 40 +Warning: Undefined property: MyArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL diff --git a/ext/spl/tests/arrayObject___construct_basic3.phpt b/ext/spl/tests/arrayObject___construct_basic3.phpt index fcd369af84..f162317773 100644 --- a/ext/spl/tests/arrayObject___construct_basic3.phpt +++ b/ext/spl/tests/arrayObject___construct_basic3.phpt @@ -61,7 +61,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: ArrayObject::$prop in %s on line 40 +Warning: Undefined property: ArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL @@ -89,7 +89,7 @@ bool(true) bool(true) - Unset: -Notice: Undefined property: MyArrayObject::$prop in %s on line 40 +Warning: Undefined property: MyArrayObject::$prop in %s on line %d Notice: Undefined index: prop in %s on line 40 NULL diff --git a/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt b/ext/spl/tests/arrayObject_exchangeArray_basic3.phpt index c6759a31cf..68f20f7bb6 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 -Notice: 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 -Notice: Undefined variable: copy in %s on line 46 +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/arrayObject_magicMethods2.phpt b/ext/spl/tests/arrayObject_magicMethods2.phpt index 18f0520fcd..3f88654a5d 100644 --- a/ext/spl/tests/arrayObject_magicMethods2.phpt +++ b/ext/spl/tests/arrayObject_magicMethods2.phpt @@ -102,7 +102,7 @@ object(ArrayObject)#2 (3) { --> Read existent, non-existent and dynamic: string(7) "changed" -Notice: Undefined property: ArrayObject::$nonexistent in %s on line 42 +Warning: Undefined property: ArrayObject::$nonexistent in %s on line %d NULL string(11) "new.changed" Original wrapped object: diff --git a/ext/spl/tests/array_026.phpt b/ext/spl/tests/array_026.phpt index 8ff6aafb93..7a1784e30e 100644 --- a/ext/spl/tests/array_026.phpt +++ b/ext/spl/tests/array_026.phpt @@ -8,9 +8,9 @@ $test['d1']['d3'] = 'world'; var_dump($test, $test3['mmmmm']); ?> --EXPECTF-- -Notice: Undefined variable: test3 in %s on line %d +Warning: Undefined variable: test3 in %s on line %d -Notice: 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 object(ArrayObject)#1 (1) { ["storage":"ArrayObject":private]=> array(1) { diff --git a/ext/spl/tests/bug54323.phpt b/ext/spl/tests/bug54323.phpt index df6416a0f1..a2e2522393 100644 --- a/ext/spl/tests/bug54323.phpt +++ b/ext/spl/tests/bug54323.phpt @@ -17,7 +17,7 @@ function testAccess($c, $ao) { var_dump($c->prop, $ao['prop']); } --EXPECTF-- -Notice: Undefined property: C::$prop in %sbug54323.php on line 14 +Warning: Undefined property: C::$prop in %s on line %d Notice: Undefined index: prop in %sbug54323.php on line 14 NULL diff --git a/ext/spl/tests/bug62978.phpt b/ext/spl/tests/bug62978.phpt index 972bd07ce1..ec6275346e 100644 --- a/ext/spl/tests/bug62978.phpt +++ b/ext/spl/tests/bug62978.phpt @@ -31,9 +31,9 @@ NULL Notice: Undefined index: epic_magic in %sbug62978.php on line %d NULL -Notice: Undefined variable: c in %sbug62978.php on line %d +Warning: Undefined variable: c in %s on line %d -Notice: 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 NULL Notice: Undefined index: epic_magic in %sbug62978.php on line %d diff --git a/ext/spl/tests/bug72888.phpt b/ext/spl/tests/bug72888.phpt index d354490f88..c27c8424ef 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" -Notice: Undefined variable: y in %sbug72888.php on line %d +Warning: Undefined variable: y in %s on line %d NULL diff --git a/ext/spl/tests/iterator_026.phpt b/ext/spl/tests/iterator_026.phpt index 8eb77a7baf..963950cd0e 100644 --- a/ext/spl/tests/iterator_026.phpt +++ b/ext/spl/tests/iterator_026.phpt @@ -24,13 +24,13 @@ hasNext: yes 1=>2 hasNext: yes -Notice: Array to string conversion in %siterator_026.php on line %d +Warning: Array to string conversion in %s on line %d 0=>31 hasNext: yes 1=>32 hasNext: yes -Notice: Array to string conversion in %siterator_026.php on line %d +Warning: Array to string conversion in %s on line %d 0=>331 hasNext: no 3=>4 diff --git a/ext/spl/tests/iterator_047.phpt b/ext/spl/tests/iterator_047.phpt index 548f486528..e3e9bba05b 100644 --- a/ext/spl/tests/iterator_047.phpt +++ b/ext/spl/tests/iterator_047.phpt @@ -71,7 +71,7 @@ int(0) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(10) @@ -81,7 +81,7 @@ int(2) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(30) @@ -105,7 +105,7 @@ int(0) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(10) @@ -115,7 +115,7 @@ int(2) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -Notice: Array to string conversion in %siterator_047.php on line %d +Warning: Array to string conversion in %s on line %d MyRecursiveArrayIterator::hasChildren() int(0) int(30) diff --git a/ext/spl/tests/recursive_tree_iterator_001.phpt b/ext/spl/tests/recursive_tree_iterator_001.phpt index ac9f281388..9ac4fdbc17 100644 --- a/ext/spl/tests/recursive_tree_iterator_001.phpt +++ b/ext/spl/tests/recursive_tree_iterator_001.phpt @@ -1,7 +1,5 @@ --TEST-- SPL: RecursiveTreeIterator ---INI-- -error_reporting=E_ALL&~E_NOTICE --FILE-- <?php @@ -48,7 +46,7 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ ?> ===DONE=== ---EXPECT-- +--EXPECTF-- -- flags = BYPASS_KEY -- [0] => |-Array [0] => | |-a @@ -60,22 +58,34 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ [0] => |-4 [1] => \-c -- flags = BYPASS_CURRENT -- + +Warning: Array to string conversion in %s on line %d [|-0] => Array [| |-0] => a [| \-1] => 1 + +Warning: Array to string conversion in %s on line %d [\-a] => Array [ |-0] => 2 [ |-1] => b + +Warning: Array to string conversion in %s on line %d [ \-3] => Array [ |-0] => 4 [ \-1] => c -- flags = BYPASS_KEY|BYPASS_KEY -- + +Warning: Array to string conversion in %s on line %d [0] => Array [0] => a [1] => 1 + +Warning: Array to string conversion in %s on line %d [a] => Array [0] => 2 [1] => b + +Warning: Array to string conversion in %s on line %d [3] => Array [0] => 4 [1] => c diff --git a/ext/spl/tests/recursive_tree_iterator_006.phpt b/ext/spl/tests/recursive_tree_iterator_006.phpt index 1d1891e4a4..3440a90b6d 100644 --- a/ext/spl/tests/recursive_tree_iterator_006.phpt +++ b/ext/spl/tests/recursive_tree_iterator_006.phpt @@ -1,7 +1,5 @@ --TEST-- SPL: RecursiveTreeIterator and IteratorAggregate ---INI-- -error_reporting=E_ALL&~E_NOTICE --FILE-- <?php @@ -58,7 +56,7 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ ?> ===DONE=== ---EXPECT-- +--EXPECTF-- -- flags = BYPASS_KEY -- [0] => |-Array [0] => | |-a @@ -70,22 +68,34 @@ foreach(new RecursiveTreeIterator($it, 0, CachingIterator::CATCH_GET_CHILD) as $ [0] => |-4 [1] => \-c -- flags = BYPASS_CURRENT -- + +Warning: Array to string conversion in %s on line %d [|-0] => Array [| |-0] => a [| \-1] => 1 + +Warning: Array to string conversion in %s on line %d [\-a] => Array [ |-0] => 2 [ |-1] => b + +Warning: Array to string conversion in %s on line %d [ \-3] => Array [ |-0] => 4 [ \-1] => c -- flags = BYPASS_KEY|BYPASS_KEY -- + +Warning: Array to string conversion in %s on line %d [0] => Array [0] => a [1] => 1 + +Warning: Array to string conversion in %s on line %d [a] => Array [0] => 2 [1] => b + +Warning: Array to string conversion in %s on line %d [3] => Array [0] => 4 [1] => c diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/002.phpt index f6aa37b9fb..8d088f9129 100644 --- a/ext/standard/tests/array/002.phpt +++ b/ext/standard/tests/array/002.phpt @@ -130,17 +130,17 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [1000]=> string(4) "test" @@ -240,15 +240,15 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [16777216]=> float(-0.33333333333333) @@ -544,17 +544,17 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [0]=> string(4) "test" @@ -654,15 +654,15 @@ array(8) { } Using SORT_STRING -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s002.php on line 16 +Warning: Array to string conversion in %s on line %d array(8) { [0]=> float(-0.33333333333333) diff --git a/ext/standard/tests/array/array_combine_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt index 125221cac8..5726eb73e6 100644 --- a/ext/standard/tests/array/array_combine_variation4.phpt +++ b/ext/standard/tests/array/array_combine_variation4.phpt @@ -90,9 +90,9 @@ echo "Done"; --EXPECTF-- *** Testing array_combine() : assoc array with diff keys to both $keys and $values argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- array(0) { } diff --git a/ext/standard/tests/array/array_diff_variation9.phpt b/ext/standard/tests/array/array_diff_variation9.phpt index 05b6a1eb02..3d85bc1832 100644 --- a/ext/standard/tests/array/array_diff_variation9.phpt +++ b/ext/standard/tests/array/array_diff_variation9.phpt @@ -1,7 +1,5 @@ --TEST-- Test array_diff() function : usage variations - multidimensional arrays ---INI-- -error_reporting=E_ALL & ~E_NOTICE --FILE-- <?php /* Prototype : array array_diff(array $arr1, array $arr2 [, array ...]) @@ -38,11 +36,27 @@ var_dump(array_diff($array1, $array2['sub_arraya'])); echo "Done"; ?> ---EXPECT-- +--EXPECTF-- *** Testing array_diff() : usage variations *** -- Compare two 2-D arrays -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(0) { } + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(0) { } @@ -71,6 +85,10 @@ array(3) { } -- Compare a subarray from one 2-D array and one 2-D array -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(3) { [0]=> int(1) @@ -79,6 +97,10 @@ array(3) { [2]=> int(3) } + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(2) { ["sub_array1"]=> array(3) { diff --git a/ext/standard/tests/array/array_fill_keys_variation1.phpt b/ext/standard/tests/array/array_fill_keys_variation1.phpt index 0af38c7bde..1f394eec86 100644 --- a/ext/standard/tests/array/array_fill_keys_variation1.phpt +++ b/ext/standard/tests/array/array_fill_keys_variation1.phpt @@ -59,7 +59,7 @@ array(4) { -- Testing array_fill_keys() function with mixed array -- -Notice: Array to string conversion in %sarray_fill_keys_variation1.php on line %d +Warning: Array to string conversion in %s on line %d array(7) { ["Resource id #%d"]=> string(6) "simple" diff --git a/ext/standard/tests/array/array_fill_keys_variation4.phpt b/ext/standard/tests/array/array_fill_keys_variation4.phpt index bd89416d9d..9edc4e4a9c 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 -- -Notice: Undefined variable: unset_var in %sarray_fill_keys_variation4.php on line %d +Warning: Undefined variable: unset_var in %s on line %d array(1) { ["one"]=> NULL diff --git a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt index 26a491ad64..38b7605924 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt @@ -62,13 +62,13 @@ echo "Done"; -- Passing the entire 2-D array to $arr1 and $arr2 -- - With default arguments - -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(2) { [0]=> array(4) { @@ -95,21 +95,21 @@ array(2) { } - With more arguments - -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_assoc_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(2) { [0]=> array(4) { diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt index 6c7c956ea7..d66d9c682b 100644 --- a/ext/standard/tests/array/array_intersect_variation9.phpt +++ b/ext/standard/tests/array/array_intersect_variation9.phpt @@ -61,37 +61,37 @@ echo "Done"; -- Passing the entire 2-D array to $arr1 and $arr2 -- - With default arguments - -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(4) { [0]=> array(4) { @@ -136,53 +136,53 @@ array(4) { } - With more arguments - -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_intersect_variation9.php on line %d +Warning: Array to string conversion in %s on line %d array(4) { [0]=> array(4) { diff --git a/ext/standard/tests/array/array_map_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt index 08599e0567..8e75b91ff4 100644 --- a/ext/standard/tests/array/array_map_variation4.phpt +++ b/ext/standard/tests/array/array_map_variation4.phpt @@ -79,9 +79,9 @@ echo "Done"; --EXPECTF-- *** Testing array_map() : associative array with diff. keys for 'arr1' argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- array(0) { } diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt index 151a515205..dc5651adfb 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt @@ -80,7 +80,7 @@ echo "Done"; --EXPECTF-- *** Testing array_merge_recursive() : assoc. array with diff. keys to $arr1 argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- -- With default argument -- array(2) { diff --git a/ext/standard/tests/array/array_reverse_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt index f6e98dae82..21cced1703 100644 --- a/ext/standard/tests/array/array_reverse_variation4.phpt +++ b/ext/standard/tests/array/array_reverse_variation4.phpt @@ -83,9 +83,9 @@ echo "Done"; --EXPECTF-- *** Testing array_reverse() : usage variations *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- - default argument - array(0) { diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt index e80df1fb65..0227449233 100644 --- a/ext/standard/tests/array/array_unique_variation3.phpt +++ b/ext/standard/tests/array/array_unique_variation3.phpt @@ -68,7 +68,7 @@ echo "Done"; --EXPECTF-- *** Testing array_unique() : assoc. array with diff. keys passed to $input argument *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- array(1) { [0]=> diff --git a/ext/standard/tests/array/array_unique_variation8.phpt b/ext/standard/tests/array/array_unique_variation8.phpt index d8a318dd93..0ac6f91687 100644 --- a/ext/standard/tests/array/array_unique_variation8.phpt +++ b/ext/standard/tests/array/array_unique_variation8.phpt @@ -29,13 +29,13 @@ echo "Done"; --EXPECTF-- *** Testing array_unique() : two dimensional array for $input argument *** -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %sarray_unique_variation8.php on line %d +Warning: Array to string conversion in %s on line %d array(1) { [0]=> array(4) { diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt index ee91bba180..e468bfcf46 100644 --- a/ext/standard/tests/array/array_unshift_variation4.phpt +++ b/ext/standard/tests/array/array_unshift_variation4.phpt @@ -101,9 +101,9 @@ echo "Done"; --EXPECTF-- *** Testing array_unshift() : associative array with different keys *** -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -Notice: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d +Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d -- Iteration 1 -- int(1) array(1) { diff --git a/ext/standard/tests/array/bug30074.phpt b/ext/standard/tests/array/bug30074.phpt index 289e802c00..e0309bac1f 100644 --- a/ext/standard/tests/array/bug30074.phpt +++ b/ext/standard/tests/array/bug30074.phpt @@ -2,12 +2,12 @@ Bug #30074 (EG(uninitialized_zval_ptr) gets set to reference using EXTR_REFS, affecting later values) --FILE-- <?php -error_reporting(E_ALL & ~E_NOTICE); // We don't want the notice for $undefined $result = extract(array('a'=>$undefined), EXTR_REFS); var_dump(array($a)); echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- +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 62ba1cfaa3..d4f5210760 100644 --- a/ext/standard/tests/array/bug31158.phpt +++ b/ext/standard/tests/array/bug31158.phpt @@ -14,7 +14,7 @@ __(); echo "ok\n"; ?> --EXPECTF-- -Notice: Undefined variable: GLOBALS in %sbug31158.php on line 6 +Warning: Undefined variable: GLOBALS in %s on line %d -Notice: Trying to access array offset on value of type null in %sbug31158.php on line 6 +Warning: Trying to access array offset on value of type null in %s on line %d ok diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index 465b818174..2fc98396b1 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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: -Notice: 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 650002ce1a..2e2e1657af 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 @@ -10,7 +10,7 @@ Test get_class_methods() function : usage variations - unexpected types function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -81,10 +81,10 @@ foreach($values as $value) { }; echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_class_methods() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(67) -Error: 8 - Undefined variable: unset_var, %s(70) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 NULL @@ -112,23 +112,23 @@ NULL Arg value 0.5 NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array NULL -Error: 8 - Array to string conversion, %sget_class_methods_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array 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 8c1543d711..87a9eac6c3 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 *** -Notice: Undefined variable: undefined_var in %s on line %d +Warning: Undefined variable: undefined_var in %s on line %d -Notice: 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() expects parameter 1 to be 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 985330d413..2aaa93fa8a 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 @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -83,10 +83,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing get_parent_class() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(68) -Error: 8 - Undefined variable: unset_var, %s(71) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -114,23 +114,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sget_parent_class_variation_002.php(%d) +Error: 2 - Array to string conversion Arg value Array 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 563195cd0c..e9dfe0db6d 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 *** -Notice: Undefined variable: undefined_var in %s on line 59 +Warning: Undefined variable: undefined_var in %s on line %d -Notice: Undefined variable: unset_var in %s on line 62 +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 e545616667..961ae96287 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 @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -84,10 +84,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(69) -Error: 8 - Undefined variable: unset_var, %s(72) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -115,23 +115,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array 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 3e5447308b..dba37cc3f4 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 @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -84,10 +84,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing is_subclass_of() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(69) -Error: 8 - Undefined variable: unset_var, %s(72) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -115,23 +115,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %sis_subclass_of_variation_004.php(%d) +Error: 2 - Array to string conversion Arg value Array 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 93497c34b1..b975f81958 100644 --- a/ext/standard/tests/class_object/method_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/method_exists_variation_001.phpt @@ -13,7 +13,7 @@ spl_autoload_register(function ($className) { }); function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -83,10 +83,10 @@ foreach($values as $value) { echo "Done"; ?> ---EXPECTF-- +--EXPECT-- *** Testing method_exists() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(68) -Error: 8 - Undefined variable: unset_var, %s(71) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var Arg value 0 bool(false) @@ -114,23 +114,23 @@ bool(false) Arg value 0.5 bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) -Error: 8 - Array to string conversion, %smethod_exists_variation_001.php(%d) +Error: 2 - Array to string conversion Arg value Array bool(false) diff --git a/ext/standard/tests/file/file_put_contents_variation2.phpt b/ext/standard/tests/file/file_put_contents_variation2.phpt index 5e18ce1948..1f86ba1074 100644 --- a/ext/standard/tests/file/file_put_contents_variation2.phpt +++ b/ext/standard/tests/file/file_put_contents_variation2.phpt @@ -16,7 +16,7 @@ echo "*** Testing file_put_contents() : usage variation ***\n"; function test_error_handler($err_no, $err_msg, $filename, $linenum) { if (error_reporting() & $err_no) { // report non-silenced errors - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } } set_error_handler('test_error_handler'); @@ -110,7 +110,7 @@ unlink($filename); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing file_put_contents() : usage variation *** --int 0-- @@ -138,8 +138,8 @@ unlink($filename); --associative array-- 12 --nested arrays-- -Error: 8 - Array to string conversion, %s(%d) -Error: 8 - Array to string conversion, %s(%d) +Error: 2 - Array to string conversion +Error: 2 - Array to string conversion fooArrayArray --uppercase NULL-- diff --git a/ext/standard/tests/file/fputcsv_002.phpt b/ext/standard/tests/file/fputcsv_002.phpt index db565d5223..90999a9e70 100644 --- a/ext/standard/tests/file/fputcsv_002.phpt +++ b/ext/standard/tests/file/fputcsv_002.phpt @@ -20,7 +20,7 @@ $file = __DIR__ .'/fgetcsv-test.csv'; unlink($file); ?> --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(7) { [0]=> int(1) diff --git a/ext/standard/tests/file/fscanf_error.phpt b/ext/standard/tests/file/fscanf_error.phpt index 1df1a699cb..5666689574 100644 --- a/ext/standard/tests/file/fscanf_error.phpt +++ b/ext/standard/tests/file/fscanf_error.phpt @@ -61,7 +61,7 @@ fscanf(): supplied resource is not a valid File-Handle resource Warning: fscanf(): Different numbers of variable names and field specifiers in %s on line %d int(-1) -Notice: Undefined variable: undefined_var in %s on line %d +Warning: Undefined variable: undefined_var in %s on line %d array(0) { } diff --git a/ext/standard/tests/file/pathinfo_variaton.phpt b/ext/standard/tests/file/pathinfo_variaton.phpt index 6f4492e375..a671c22fda 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 miscelleneous input arguments *** -Notice: 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 a9d84e798b..92fa547820 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-- -Notice: 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 -Notice: 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 504de7afbf..93381d246c 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-- -Notice: Undefined variable: aa in %sbug60723.php on line %d -[%s ASIA/Chongqing] PHP Notice: Undefined variable: aa in %sbug60723.php 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 6cb413dc26..d622089cff 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 -- -Notice: 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) -- -Notice: 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) -- -Notice: 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 675affb625..2cfd17793a 100644 --- a/ext/standard/tests/general_functions/error_clear_last.phpt +++ b/ext/standard/tests/general_functions/error_clear_last.phpt @@ -20,7 +20,7 @@ NULL NULL array(4) { ["type"]=> - int(8) + int(2) ["message"]=> string(21) "Undefined variable: b" ["file"]=> diff --git a/ext/standard/tests/general_functions/error_get_last.phpt b/ext/standard/tests/general_functions/error_get_last.phpt index e6cea73f4d..a4cae412b5 100644 --- a/ext/standard/tests/general_functions/error_get_last.phpt +++ b/ext/standard/tests/general_functions/error_get_last.phpt @@ -22,14 +22,14 @@ NULL error_get_last() expects exactly 0 parameters, 1 given NULL -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d array(4) { ["type"]=> - int(8) + int(2) ["message"]=> string(21) "Undefined variable: b" ["file"]=> - string(%i) "%s" + string(%d) "%s" ["line"]=> int(11) } diff --git a/ext/standard/tests/general_functions/gettype_settype_basic.phpt b/ext/standard/tests/general_functions/gettype_settype_basic.phpt index f8ff6c4460..fac0327ad5 100644 --- a/ext/standard/tests/general_functions/gettype_settype_basic.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_basic.phpt @@ -846,7 +846,7 @@ string(6) "object" -- Setting type of data to string -- -- Iteration 1 -- -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" @@ -855,7 +855,7 @@ bool(true) string(14) "another string" string(6) "string" -- Iteration 3 -- -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" diff --git a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt index 7fb8789ff3..eb43b85f30 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation1.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to null type */ @@ -180,9 +172,6 @@ foreach ($var_values as $var) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to null -- @@ -576,14 +565,4 @@ string(6) "object" bool(true) NULL string(4) "NULL" --- Iteration 79 -- -string(4) "NULL" -bool(true) -NULL -string(4) "NULL" --- Iteration 80 -- -string(4) "NULL" -bool(true) -NULL -string(4) "NULL" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt index d44c04e5dd..5e49821f2c 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation2.phpt @@ -42,10 +42,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -153,10 +149,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); // test conversion to these types @@ -189,9 +181,6 @@ foreach ($types as $type) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing settype() & gettype() : usage variations *** -- Setting type of data to integer -- @@ -588,16 +577,6 @@ string(6) "object" bool(true) int(1) string(7) "integer" --- Iteration 79 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" --- Iteration 80 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" -- Setting type of data to int -- -- Iteration 1 -- @@ -993,14 +972,4 @@ string(6) "object" bool(true) int(1) string(7) "integer" --- Iteration 79 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" --- Iteration 80 -- -string(4) "NULL" -bool(true) -int(0) -string(7) "integer" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt index 71b03461eb..f17b261437 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation3.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); // test conversion to these types @@ -185,9 +177,6 @@ foreach ($types as $type) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing settype() & gettype() : usage variations *** -- Setting type of data to float -- @@ -584,16 +573,6 @@ string(6) "object" bool(true) float(1) string(6) "double" --- Iteration 79 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" --- Iteration 80 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" -- Setting type of data to double -- -- Iteration 1 -- @@ -989,14 +968,4 @@ string(6) "object" bool(true) float(1) string(6) "double" --- Iteration 79 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" --- Iteration 80 -- -string(4) "NULL" -bool(true) -float(0) -string(6) "double" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt index a14cb73dbb..00da4bf4bb 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation4.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -160,10 +156,6 @@ $var_values = array ( new point(0, 0), new class_with_no_member, - /* undefined/unset vars */ - $unset_var, - $undef_var, - /* binary strings */ b"0", b'0', @@ -210,9 +202,6 @@ foreach ($types as $type) { echo "Done\n"; ?> --EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - *** Testing settype() & gettype() : usage variations *** -- Setting type of data to boolean -- @@ -632,24 +621,24 @@ bool(true) bool(true) string(7) "boolean" -- Iteration 84 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 85 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 86 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 87 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 88 -- string(6) "string" @@ -696,16 +685,6 @@ string(6) "string" bool(true) bool(true) string(7) "boolean" --- Iteration 97 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" --- Iteration 98 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" -- Setting type of data to bool -- -- Iteration 1 -- @@ -1124,24 +1103,24 @@ bool(true) bool(true) string(7) "boolean" -- Iteration 84 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 85 -- -string(4) "NULL" +string(6) "string" bool(true) bool(false) string(7) "boolean" -- Iteration 86 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 87 -- string(6) "string" bool(true) -bool(false) +bool(true) string(7) "boolean" -- Iteration 88 -- string(6) "string" @@ -1188,14 +1167,4 @@ string(6) "string" bool(true) bool(true) string(7) "boolean" --- Iteration 97 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" --- Iteration 98 -- -string(6) "string" -bool(true) -bool(true) -string(7) "boolean" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt index c5e2640f9c..6437baa10b 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation5.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to resource type */ @@ -179,10 +171,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to resource -- @@ -699,16 +688,4 @@ object(point)#3 (2) { int(0) } string(6) "object" --- Iteration 79 -- -string(4) "NULL" -2: settype(): Cannot convert to resource type -bool(false) -NULL -string(4) "NULL" --- Iteration 80 -- -string(4) "NULL" -2: settype(): Cannot convert to resource type -bool(false) -NULL -string(4) "NULL" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt index 27beaa0744..7c5ea5efb6 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation6.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to array type */ @@ -181,10 +173,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to array -- @@ -831,16 +820,4 @@ array(2) { int(0) } string(5) "array" --- Iteration 79 -- -string(4) "NULL" -bool(true) -array(0) { -} -string(5) "array" --- Iteration 80 -- -string(4) "NULL" -bool(true) -array(0) { -} -string(5) "array" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt index dae20a1856..b282cbdab1 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation7.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to object type */ @@ -179,10 +171,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to object -- @@ -829,16 +818,4 @@ object(point)#3 (2) { int(0) } string(6) "object" --- Iteration 79 -- -string(4) "NULL" -bool(true) -object(stdClass)#4 (0) { -} -string(6) "object" --- Iteration 80 -- -string(4) "NULL" -bool(true) -object(stdClass)#4 (0) { -} -string(6) "object" Done diff --git a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt index 97f550e446..7ddfe54ab6 100644 --- a/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ b/ext/standard/tests/general_functions/gettype_settype_variation8.phpt @@ -38,10 +38,6 @@ set_error_handler("foo"); $var1 = "another string"; $var2 = array(2,3,4); -// a variable which is unset -$unset_var = 10.5; -unset( $unset_var ); - class point { var $x; @@ -149,10 +145,6 @@ $var_values = array ( new point(NULL, NULL), new point(2.5, 40.5), new point(0, 0), - - /* undefined/unset vars */ - $unset_var, - $undef_var ); /* test conversion to string type */ @@ -179,10 +171,7 @@ foreach ($var_values as $var) { echo "Done\n"; ?> ---EXPECT-- -8: Undefined variable: unset_var -8: Undefined variable: undef_var - +--EXPECTF-- *** Testing gettype() & settype() functions : usage variations *** -- Setting type of data to string -- @@ -399,31 +388,31 @@ string(12) "@$%#$%^$%^&^" string(6) "string" -- Iteration 43 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 44 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 45 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 46 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" -- Iteration 47 -- string(5) "array" -8: Array to string conversion +2: Array to string conversion bool(true) string(5) "Array" string(6) "string" @@ -582,14 +571,4 @@ string(6) "object" bool(true) string(11) "ObjectPoint" string(6) "string" --- Iteration 79 -- -string(4) "NULL" -bool(true) -string(0) "" -string(6) "string" --- Iteration 80 -- -string(4) "NULL" -bool(true) -string(0) "" -string(6) "string" Done diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt index 531c64aa5a..a75ac12272 100644 --- a/ext/standard/tests/general_functions/strval.phpt +++ b/ext/standard/tests/general_functions/strval.phpt @@ -277,19 +277,19 @@ string(14) "Resource id #%d" string(14) "Resource id #%d" -- Iteration 4 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 5 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 6 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 7 -- -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 8 -- string(0) "" diff --git a/ext/standard/tests/image/getimagesize_variation2.phpt b/ext/standard/tests/image/getimagesize_variation2.phpt index c7691634c9..240b015f1f 100644 --- a/ext/standard/tests/image/getimagesize_variation2.phpt +++ b/ext/standard/tests/image/getimagesize_variation2.phpt @@ -9,7 +9,7 @@ Test getimagesize() function : usage variations - unexpected type for arg 2 */ function test_error_handler($err_no, $err_msg, $filename, $linenum) { - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; + echo "Error: $err_no - $err_msg\n"; } set_error_handler('test_error_handler'); @@ -79,10 +79,10 @@ foreach($values as $key => $value) { ?> ===DONE=== ---EXPECTF-- +--EXPECT-- *** Testing getimagesize() : usage variations *** -Error: 8 - Undefined variable: undefined_var, %s(%d) -Error: 8 - Undefined variable: unset_var, %s(%d) +Error: 2 - Undefined variable: undefined_var +Error: 2 - Undefined variable: unset_var -- Arg value 0 -- string(28) "4a46494600010201006000600000" diff --git a/ext/standard/tests/math/base_convert_variation1.phpt b/ext/standard/tests/math/base_convert_variation1.phpt index 9f106bc704..ee151e3f7f 100644 --- a/ext/standard/tests/math/base_convert_variation1.phpt +++ b/ext/standard/tests/math/base_convert_variation1.phpt @@ -148,7 +148,7 @@ string(1) "0" -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: Invalid characters passed for attempted conversion, these have been ignored in %s on line %d string(1) "0" diff --git a/ext/standard/tests/password/password_hash_error.phpt b/ext/standard/tests/password/password_hash_error.phpt index 04a8249ced..0eec2383c1 100644 --- a/ext/standard/tests/password/password_hash_error.phpt +++ b/ext/standard/tests/password/password_hash_error.phpt @@ -30,7 +30,7 @@ try { --EXPECTF-- password_hash() expects at least 2 parameters, 1 given -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Warning: password_hash(): Unknown password hashing algorithm: Array in %s on line %d NULL diff --git a/ext/standard/tests/serialize/bug69793.phpt b/ext/standard/tests/serialize/bug69793.phpt index 8426c1573e..b2d9fbb256 100644 --- a/ext/standard/tests/serialize/bug69793.phpt +++ b/ext/standard/tests/serialize/bug69793.phpt @@ -7,11 +7,11 @@ $e = unserialize('O:9:"Exception":7:{s:17:"'."\0".'Exception'."\0".'string";s:1: var_dump($e.""); ?> --EXPECTF-- -Notice: Undefined property: Exception::$file in %s%ebug69793.php on line %d +Warning: Undefined property: Exception::$file in %s on line %d -Notice: Undefined property: Exception::$previous in %s%ebug69793.php on line %d +Warning: Undefined property: Exception::$previous in %s on line %d -Notice: Undefined property: Exception::$previous in %s%ebug69793.php on line %d +Warning: Undefined property: Exception::$previous in %s on line %d string(41) "Exception in :1337 Stack trace: #0 {main}" diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt Binary files differindex c7f9e1cbd3..920fd35310 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/serialize/serialization_objects_005.phpt b/ext/standard/tests/serialize/serialization_objects_005.phpt index 4c631c6a59..48325f4fba 100644 --- a/ext/standard/tests/serialize/serialization_objects_005.phpt +++ b/ext/standard/tests/serialize/serialization_objects_005.phpt @@ -77,7 +77,7 @@ string(9) "p.changed" bool(false) bool(true) -Notice: Undefined property: C::$x in %s on line 37 +Warning: Undefined property: C::$x in %s on line %d NULL diff --git a/ext/standard/tests/streams/bug53903.phpt b/ext/standard/tests/streams/bug53903.phpt index fd0b770f6b..ca04a5ca14 100644 --- a/ext/standard/tests/streams/bug53903.phpt +++ b/ext/standard/tests/streams/bug53903.phpt @@ -24,7 +24,7 @@ $s[] = 1; // Cannot use a scalar value as an array print_r($s); --EXPECTF-- -Notice: Undefined property: sw::$undefined in %s on line %d +Warning: Undefined property: sw::$undefined in %s on line %d Array ( [0] => 1 diff --git a/ext/standard/tests/streams/bug60602.phpt b/ext/standard/tests/streams/bug60602.phpt index 82917ecbd6..4f88c8dd2c 100644 --- a/ext/standard/tests/streams/bug60602.phpt +++ b/ext/standard/tests/streams/bug60602.phpt @@ -48,7 +48,7 @@ if (is_resource($p)) { ?> ==DONE== --EXPECTF-- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d int(%d) int(0) bool(true) diff --git a/ext/standard/tests/strings/bug54238.phpt b/ext/standard/tests/strings/bug54238.phpt index 0f60098ff0..e679bb6928 100644 --- a/ext/standard/tests/strings/bug54238.phpt +++ b/ext/standard/tests/strings/bug54238.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #54238 (use-after-free in substr_replace()) ---INI-- -error_reporting=E_ALL&~E_NOTICE --FILE-- <?php $f = array(array('A', 'A')); @@ -9,7 +7,10 @@ $f = array(array('A', 'A')); $z = substr_replace($f, $f, $f, 1); var_dump($z, $f); ?> ---EXPECT-- +--EXPECTF-- +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d array(1) { [0]=> string(9) "AArrayray" diff --git a/ext/standard/tests/strings/crc32_variation3.phpt b/ext/standard/tests/strings/crc32_variation3.phpt index 691703103e..bc219c43e9 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 *** -Notice: Undefined variable: hello in %s on line %d +Warning: Undefined variable: hello in %s on line %d -Notice: 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/implode.phpt b/ext/standard/tests/strings/implode.phpt index 330ba2ff30..ec685586ef 100644 --- a/ext/standard/tests/strings/implode.phpt +++ b/ext/standard/tests/strings/implode.phpt @@ -12,5 +12,5 @@ echo implode(':', array('foo', array('bar', 'baz'), 'burp'))."\n"; foobarbaz foo:bar:baz -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d foo:Array:burp diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt Binary files differindex 3906e997f1..500bdc6dce 100644 --- a/ext/standard/tests/strings/implode1.phpt +++ b/ext/standard/tests/strings/implode1.phpt diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 695ee2ddca..33c519f13e 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -122,31 +122,31 @@ string(29) "element11.07654321E-9element2" string(19) "element10.5element2" -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(0) "" -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(1) "0" -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(1) "1" -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(7) "1Array2" -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(11) "redArraypen" diff --git a/ext/standard/tests/strings/join_variation3.phpt b/ext/standard/tests/strings/join_variation3.phpt index c3799cc01a..a896123321 100644 --- a/ext/standard/tests/strings/join_variation3.phpt +++ b/ext/standard/tests/strings/join_variation3.phpt @@ -62,9 +62,9 @@ string(6) "1], [2" string(10) "1.1], [2.2" -- Iteration 3 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(14) "Array], [Array" -- Iteration 4 -- string(5) "], [1" diff --git a/ext/standard/tests/strings/join_variation4.phpt b/ext/standard/tests/strings/join_variation4.phpt Binary files differindex f6154f1e4d..49cbfa15bc 100644 --- a/ext/standard/tests/strings/join_variation4.phpt +++ b/ext/standard/tests/strings/join_variation4.phpt diff --git a/ext/standard/tests/strings/join_variation5.phpt b/ext/standard/tests/strings/join_variation5.phpt index e3f3e7ec08..f81524543d 100644 --- a/ext/standard/tests/strings/join_variation5.phpt +++ b/ext/standard/tests/strings/join_variation5.phpt @@ -33,19 +33,19 @@ echo "Done\n"; --EXPECTF-- *** Testing implode() : usage variations - sub arrays *** -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(27) "ArrayTESTArrayTESTPHPTEST50" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Deprecated: join(): Passing glue string after array is deprecated. Swap the parameters in %s on line %d string(19) "1Array2Array3Array4" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(18) "Array2Array2PHP250" string(10) "1, 2, 3, 4" string(8) "one, two" diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt Binary files differindex 38cb7e566f..109b8e5a5d 100644 --- a/ext/standard/tests/strings/lcfirst.phpt +++ b/ext/standard/tests/strings/lcfirst.phpt diff --git a/ext/standard/tests/strings/print_variation1.phpt b/ext/standard/tests/strings/print_variation1.phpt index 19a28678f2..38fe919528 100644 --- a/ext/standard/tests/strings/print_variation1.phpt +++ b/ext/standard/tests/strings/print_variation1.phpt @@ -110,17 +110,17 @@ int(1) int(1) -- Iteration 9 -- -Notice: Array to string conversion in %sprint_variation1.php on line %d +Warning: Array to string conversion in %s on line %d Array int(1) -- Iteration 10 -- -Notice: Array to string conversion in %sprint_variation1.php on line %d +Warning: Array to string conversion in %s on line %d Array int(1) -- Iteration 11 -- -Notice: Array to string conversion in %sprint_variation1.php on line %d +Warning: Array to string conversion in %s on line %d Array int(1) -- Iteration 12 -- diff --git a/ext/standard/tests/strings/printf_variation1.phpt b/ext/standard/tests/strings/printf_variation1.phpt index fcf69ebaa7..62f5e21916 100644 --- a/ext/standard/tests/strings/printf_variation1.phpt +++ b/ext/standard/tests/strings/printf_variation1.phpt @@ -188,71 +188,71 @@ int(3) -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) diff --git a/ext/standard/tests/strings/printf_variation2.phpt b/ext/standard/tests/strings/printf_variation2.phpt index 8e7d5ec910..6cf3e90d62 100644 --- a/ext/standard/tests/strings/printf_variation2.phpt +++ b/ext/standard/tests/strings/printf_variation2.phpt @@ -7,8 +7,6 @@ Test printf() function : usage variations - with all types of values for arg1 ar * Source code: ext/standard/formatted_print.c */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing printf() : with different types of values passed for arg1 argument ***\n"; // initialing required variables @@ -166,32 +164,52 @@ int(3) int(3) -- Iteration 10 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 11 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 12 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 13 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 14 -- + +Warning: Array to string conversion in %s on line %d Array int(5) + +Warning: Array to string conversion in %s on line %d Array int(5) diff --git a/ext/standard/tests/strings/sprintf_variation1.phpt b/ext/standard/tests/strings/sprintf_variation1.phpt index bf77e3bc06..33320b9f1c 100644 --- a/ext/standard/tests/strings/sprintf_variation1.phpt +++ b/ext/standard/tests/strings/sprintf_variation1.phpt @@ -155,57 +155,57 @@ string(3) "0.5" -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 15 -- diff --git a/ext/standard/tests/strings/sprintf_variation18.phpt b/ext/standard/tests/strings/sprintf_variation18.phpt index 2bf9322c83..74547cf53e 100644 --- a/ext/standard/tests/strings/sprintf_variation18.phpt +++ b/ext/standard/tests/strings/sprintf_variation18.phpt @@ -7,8 +7,6 @@ Test sprintf() function : usage variations - string formats with array values * Source code: ext/standard/formatted_print.c */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing sprintf() : string formats with array values ***\n"; // different arrays used to test he function @@ -47,185 +45,377 @@ foreach($array_values as $array_value) { echo "Done"; ?> ---EXPECT-- +--EXPECTF-- *** Testing sprintf() : string formats with array values *** -- Iteration 1 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 2 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 3 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 4 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 5 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 6 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 7 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 8 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 9 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 10 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 11 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" -- Iteration 12 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(5) "Array" string(1) "s" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) "Array " + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(6) " Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(30) " Array" string(10) "a-zA-Z0-9]" string(1) "s" diff --git a/ext/standard/tests/strings/sprintf_variation2.phpt b/ext/standard/tests/strings/sprintf_variation2.phpt index 1bab5dc862..0f8290a9a7 100644 --- a/ext/standard/tests/strings/sprintf_variation2.phpt +++ b/ext/standard/tests/strings/sprintf_variation2.phpt @@ -7,8 +7,6 @@ Test sprintf() function : usage variations - with all types of values for arg1 a * Source code: ext/standard/formatted_print.c */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing sprintf() : with different types of values passed for arg1 argument ***\n"; // initialing required variables @@ -144,23 +142,43 @@ string(3) "0.5" string(3) "0.5" -- Iteration 10 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 11 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 12 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 13 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 14 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 15 -- diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt index bef11f872a..b0ca488f3c 100644 --- a/ext/standard/tests/strings/str_replace.phpt +++ b/ext/standard/tests/strings/str_replace.phpt @@ -876,7 +876,7 @@ array(2) { } int(6) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(2) { [0]=> string(15) "ArrayArrayArray" @@ -925,7 +925,7 @@ int(0) string(5) "FOUND" string(5) "FOUND" -Notice: 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_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt index 8ae709745f..c6851c5c9c 100644 --- a/ext/standard/tests/strings/str_replace_variation3.phpt +++ b/ext/standard/tests/strings/str_replace_variation3.phpt @@ -173,7 +173,7 @@ array(2) { } int(6) -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d array(1) { [0]=> string(15) "ArrayArrayArray" @@ -220,7 +220,7 @@ int(0) string(5) "FOUND" string(5) "FOUND" -Notice: 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 18652699e2..6ce8c38f22 100644 --- a/ext/standard/tests/strings/str_word_count1.phpt +++ b/ext/standard/tests/strings/str_word_count1.phpt @@ -25,10 +25,10 @@ DONE int(0) Invalid format value -1 -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d Invalid format value -1 -Notice: Undefined variable: a in %s on line %d +Warning: Undefined variable: a in %s on line %d NULL DONE diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt Binary files differindex d9063cc9de..4cca47ac96 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 fd20e50195..1e0f5d18a2 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 156038ed7b..0db36eea22 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 9fc521d8d8..8e1a1a7472 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 81ddee0804..22fe2d0da9 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/strtr_variation6.phpt b/ext/standard/tests/strings/strtr_variation6.phpt index 5e06da6178..272e58a544 100644 --- a/ext/standard/tests/strings/strtr_variation6.phpt +++ b/ext/standard/tests/strings/strtr_variation6.phpt @@ -103,15 +103,15 @@ string(6) "m1tatm" string(6) "tm0atm" -- Iteration 7 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(6) "0120tm" -- Iteration 8 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(6) "0120tm" -- Iteration 9 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(6) "0120tm" -- Iteration 10 -- string(6) "0a2atm" diff --git a/ext/standard/tests/strings/strval.phpt b/ext/standard/tests/strings/strval.phpt index b837a079d4..8f01cbfc0b 100644 --- a/ext/standard/tests/strings/strval.phpt +++ b/ext/standard/tests/strings/strval.phpt @@ -22,5 +22,5 @@ string(3) "1.1" string(1) "1" string(0) "" -Notice: Array to string conversion in %sstrval.php on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" diff --git a/ext/standard/tests/strings/strval_variation1.phpt b/ext/standard/tests/strings/strval_variation1.phpt index 5918c286e2..d833fa01be 100644 --- a/ext/standard/tests/strings/strval_variation1.phpt +++ b/ext/standard/tests/strings/strval_variation1.phpt @@ -9,8 +9,6 @@ Test strval() function : usage variations - Pass different data types as strval echo "*** Testing strval() : usage variations ***\n"; -error_reporting(E_ALL ^ E_NOTICE); - //get an unset variable $unset_var = 10; unset ($unset_var); @@ -147,9 +145,13 @@ string(14) "1.007654321E-8" string(3) "0.5" -- Iteration 18 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 19 -- + +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 20 -- diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt Binary files differindex 3508881d3c..ea575f6f11 100644 --- a/ext/standard/tests/strings/ucfirst.phpt +++ b/ext/standard/tests/strings/ucfirst.phpt diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index 8be51e1798..d02855d61e 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -46,7 +46,7 @@ unlink( $file ); --EXPECTF-- -- Testing vfprintf() function with wrong variable types as argument -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d int(5) string(5) "Array" int(9) diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt index 1f8dfefca4..6285bd11f1 100644 --- a/ext/standard/tests/strings/vfprintf_variation20.phpt +++ b/ext/standard/tests/strings/vfprintf_variation20.phpt @@ -108,15 +108,15 @@ unlink($data_file); --EXPECTF-- *** Testing vfprintf() : with unexpected values for format argument *** -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d *** Testing vprintf() with with unexpected values for format argument *** diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt index ff806154f4..6f3250e5f1 100644 --- a/ext/standard/tests/strings/vfprintf_variation8.phpt +++ b/ext/standard/tests/strings/vfprintf_variation8.phpt @@ -12,8 +12,6 @@ Test vfprintf() function : usage variations - string formats with non-string val * the '$format' and '$args' arguments of the function */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing vfprintf() : string formats and non-string values ***\n"; // defining array of string formats @@ -81,9 +79,45 @@ unlink($data_file); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing vfprintf() : string formats and non-string values *** +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + -- Iteration 1 -- 2.2 0.2 10.2 123456.234 s -1234.6789 1234.6789 diff --git a/ext/standard/tests/strings/vprintf_variation1.phpt b/ext/standard/tests/strings/vprintf_variation1.phpt index 5cf50105ab..94158243b7 100644 --- a/ext/standard/tests/strings/vprintf_variation1.phpt +++ b/ext/standard/tests/strings/vprintf_variation1.phpt @@ -141,31 +141,31 @@ int(3) -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d Array int(5) diff --git a/ext/standard/tests/strings/vprintf_variation8.phpt b/ext/standard/tests/strings/vprintf_variation8.phpt index f635b1d4c0..eecc60ac3c 100644 --- a/ext/standard/tests/strings/vprintf_variation8.phpt +++ b/ext/standard/tests/strings/vprintf_variation8.phpt @@ -12,8 +12,6 @@ Test vprintf() function : usage variations - string formats with non-string valu * the '$format' and '$args' arguments of the function */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing vprintf() : string formats and non-string values ***\n"; // defining array of string formats @@ -72,7 +70,7 @@ foreach($args_array as $args) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing vprintf() : string formats and non-string values *** -- Iteration 1 -- @@ -92,6 +90,42 @@ int(172) int(132) -- Iteration 3 -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d Array Array Array Array s Array Array Arra Arra Array Arra diff --git a/ext/standard/tests/strings/vsprintf_variation1.phpt b/ext/standard/tests/strings/vsprintf_variation1.phpt index 15c749d3f8..33bc043927 100644 --- a/ext/standard/tests/strings/vsprintf_variation1.phpt +++ b/ext/standard/tests/strings/vsprintf_variation1.phpt @@ -130,27 +130,27 @@ string(3) "0.5" -- Iteration 10 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 11 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 12 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 13 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 14 -- -Notice: Array to string conversion in %s on line %d +Warning: Array to string conversion in %s on line %d string(5) "Array" -- Iteration 15 -- diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt index 0efd8bb008..a2adbfa093 100644 --- a/ext/standard/tests/strings/vsprintf_variation8.phpt +++ b/ext/standard/tests/strings/vsprintf_variation8.phpt @@ -12,8 +12,6 @@ Test vsprintf() function : usage variations - string formats with non-string val * the '$format' and '$args' arguments of the function */ -error_reporting(E_ALL & ~E_NOTICE); - echo "*** Testing vsprintf() : string formats and non-string values ***\n"; // defining array of string formats @@ -70,7 +68,7 @@ foreach($args_array as $args) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- *** Testing vsprintf() : string formats and non-string values *** -- Iteration 1 -- @@ -88,6 +86,42 @@ string(130) "2 -2 2 2 123456 2 -2" -- Iteration 3 -- + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d + +Warning: Array to string conversion in %s on line %d string(129) "Array Array Array Array Array Array Arra Arra Array Arra diff --git a/ext/xml/tests/xml_parser_set_option_variation3.phpt b/ext/xml/tests/xml_parser_set_option_variation3.phpt index 836ee7a469..4187ddf068 100644 --- a/ext/xml/tests/xml_parser_set_option_variation3.phpt +++ b/ext/xml/tests/xml_parser_set_option_variation3.phpt @@ -15,7 +15,6 @@ if (!extension_loaded("xml")) { */ echo "*** Testing xml_parser_set_option() : usage variations ***\n"; -error_reporting(E_ALL & ~E_NOTICE); class aClass { function __toString() { @@ -79,12 +78,6 @@ $values = array( // resource data $fp, - - // undefined data - $undefined_var, - - // unset data - $unset_var, ); // loop through each element of the array for value @@ -174,14 +167,10 @@ Arg value string bool(true) Arg value Some Ascii Data -bool(true) -Arg value Resource id %s +Notice: Object of class aClass could not be converted to int in %s on line %d bool(true) -Arg value -bool(true) - -Arg value +Arg value Resource id %s bool(true) Done diff --git a/ext/zip/tests/oo_properties.phpt b/ext/zip/tests/oo_properties.phpt index b435d6c159..108a85e29b 100644 --- a/ext/zip/tests/oo_properties.phpt +++ b/ext/zip/tests/oo_properties.phpt @@ -40,7 +40,7 @@ zip->numFiles (4): empty(): 0 isset(): 1 -Notice: Undefined property: ZipArchive::$bogus in %s on line %d +Warning: Undefined property: ZipArchive::$bogus in %s on line %d zip->bogus (0): empty(): 1 isset(): 0 diff --git a/tests/basic/025.phpt b/tests/basic/025.phpt index 37561a2a2e..30d50c805d 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 -Notice: 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 19ee5d583f..d717b2b0b0 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) { } -Notice: 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 6a62282ea2..5982f61c91 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) { } -Notice: 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 a7c7e496d8..17432e9298 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) { } -Notice: 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/bug27468.phpt b/tests/classes/bug27468.phpt index 58a7b6cb16..1c54fa61ce 100644 --- a/tests/classes/bug27468.phpt +++ b/tests/classes/bug27468.phpt @@ -11,7 +11,7 @@ new foo(); echo 'OK'; ?> --EXPECTF-- -Notice: Undefined property: foo::$x in %sbug27468.php on line 4 +Warning: Undefined property: foo::$x in %s on line %d Warning: Invalid argument supplied for foreach() in %sbug27468.php on line 4 OK diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index 38da2dfde0..af9915c277 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-- -Notice: Undefined variable: undef in %s on line 5 +Warning: Undefined variable: undef in %s on line %d Attempt to access various kinds of class constants: int(1) diff --git a/tests/classes/constants_basic_002.phpt b/tests/classes/constants_basic_002.phpt index def661ec45..88c66aaee8 100644 --- a/tests/classes/constants_basic_002.phpt +++ b/tests/classes/constants_basic_002.phpt @@ -23,7 +23,7 @@ string(5) "hello" Fail to read class constant from instance. -Notice: Undefined property: aclass::$myConst in %s on line 12 +Warning: Undefined property: aclass::$myConst in %s on line %d NULL Class constant not visible in object var_dump. diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt index 89c26d3dd3..64641c47c5 100644 --- a/tests/classes/static_properties_003.phpt +++ b/tests/classes/static_properties_003.phpt @@ -34,7 +34,7 @@ Notice: Accessing static property C::$x as non static in %s on line 11 Notice: Accessing static property C::$x as non static in %s on line 12 -Notice: Undefined property: C::$x in %s on line 12 +Warning: Undefined property: C::$x in %s on line %d Notice: Accessing static property C::$x as non static in %s on line 13 diff --git a/tests/lang/bison1.phpt b/tests/lang/bison1.phpt index 3571576fb8..f77cce0055 100644 --- a/tests/lang/bison1.phpt +++ b/tests/lang/bison1.phpt @@ -2,8 +2,8 @@ Bison weirdness --FILE-- <?php -error_reporting(E_ALL & ~E_NOTICE); echo "blah-$foo\n"; ?> ---EXPECT-- +--EXPECTF-- +Warning: Undefined variable: foo in %s on line %d blah- diff --git a/tests/lang/bug23584.phpt b/tests/lang/bug23584.phpt index 417cfb0856..b9dc10ac67 100644 --- a/tests/lang/bug23584.phpt +++ b/tests/lang/bug23584.phpt @@ -9,5 +9,5 @@ error_reporting(E_ALL); echo $foo; ?> ---EXPECTREGEX-- -Notice: Undefined variable:.*foo in .* on line 6 +--EXPECTF-- +Warning: Undefined variable: foo in %s on line 6 diff --git a/tests/lang/bug27439.phpt b/tests/lang/bug27439.phpt index 4bcadb78fd..de4bcd05a7 100644 --- a/tests/lang/bug27439.phpt +++ b/tests/lang/bug27439.phpt @@ -65,7 +65,7 @@ echo "===DONE==="; ?> --EXPECTF-- 123 -Notice: Undefined property: test::$foobar in %s on line %d +Warning: Undefined property: test::$foobar in %s on line %d Warning: Invalid argument supplied for foreach() in %s on line %d diff --git a/tests/lang/foreachLoopObjects.004.phpt b/tests/lang/foreachLoopObjects.004.phpt index 01e4e9fd9a..283e6be90c 100644 --- a/tests/lang/foreachLoopObjects.004.phpt +++ b/tests/lang/foreachLoopObjects.004.phpt @@ -34,13 +34,13 @@ Removing the current element from an iterated object. string(10) "Original a" string(10) "Original b" -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d string(10) "Original c" -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d string(10) "Original d" -Notice: Undefined property: C::$b in %s on line %d +Warning: Undefined property: C::$b in %s on line %d string(10) "Original e" object(C)#%d (4) { ["a"]=> diff --git a/tests/lang/passByReference_003.phpt b/tests/lang/passByReference_003.phpt index ad9e1e39de..de9ac09d8d 100644 --- a/tests/lang/passByReference_003.phpt +++ b/tests/lang/passByReference_003.phpt @@ -25,16 +25,16 @@ var_dump($undef2) --EXPECTF-- Passing undefined by value -Notice: Undefined variable: undef1 in %s on line %d +Warning: Undefined variable: undef1 in %s on line %d -Notice: 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 Inside passbyVal call: NULL After call -Notice: 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 ffa5de589f..82b79b684f 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 ---- -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d NULL NULL -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: 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 ---- -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d NULL NULL -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: 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 ---- -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d NULL NULL -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d -Notice: Undefined variable: u1 in %s on line %d +Warning: Undefined variable: u1 in %s on line %d NULL string(11) "Ref changed" -Notice: Undefined variable: u2 in %s on line %d +Warning: Undefined variable: u2 in %s on line %d -Notice: 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 6df8af1c2a..9bf73b064b 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; ?> -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d -Notice: Undefined variable: b in %s on line %d +Warning: Undefined variable: b in %s on line %d |