13 files changed, 46 insertions, 26 deletions
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