- Update tests after correcting internal order of actions

diff --git a/ext/spl/tests/iterator_014.phpt b/ext/spl/tests/iterator_014.phpt
index ff8bb2cf0144f96436b4d3af71d0452b7991b429..f6e8ce9d0104e25cf2d420ff9c8f3ba3ea740267 100755 (executable)
--- a/ext/spl/tests/iterator_014.phpt
+++ b/ext/spl/tests/iterator_014.phpt
@@ -80,7 +80,7 @@ foreach(new RecursiveArrayIteratorIterator(new RecursiveArrayIterator(array("a",
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 RecursiveArrayIteratorIterator::rewind
 RecursiveArrayIteratorIterator::valid
 RecursiveArrayIteratorIterator::current
@@ -107,7 +107,7 @@ RecursiveArrayIteratorIterator::key
 1=>bbb
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
 RecursiveArrayIterator::getChildren
 RecursiveArrayIteratorIterator::beginChildren(2)
 RecursiveArrayIterator::getChildren
@@ -118,11 +118,11 @@ RecursiveArrayIteratorIterator::key
 0=>bcaa
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
+RecursiveArrayIteratorIterator::endChildren(3)
+RecursiveArrayIterator::valid = false
 RecursiveArrayIteratorIterator::endChildren(2)
 RecursiveArrayIterator::valid = false
 RecursiveArrayIteratorIterator::endChildren(1)
-RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
 RecursiveArrayIterator::getChildren
 RecursiveArrayIteratorIterator::beginChildren(1)
 RecursiveArrayIteratorIterator::valid
@@ -131,7 +131,7 @@ RecursiveArrayIteratorIterator::key
 0=>ca
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
 RecursiveArrayIteratorIterator::valid
 RecursiveArrayIteratorIterator::current
 RecursiveArrayIteratorIterator::key

diff --git a/ext/spl/tests/iterator_015.phpt b/ext/spl/tests/iterator_015.phpt
index a617e646386cb38f13ae97d42dd10fce587542d4..3a18efd80f49e09afa1a8168d536cd84c731db48 100755 (executable)
--- a/ext/spl/tests/iterator_015.phpt
+++ b/ext/spl/tests/iterator_015.phpt
@@ -30,7 +30,7 @@ class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator
 
        function endChildren()
        {
-               echo str_repeat('  ',$this->getDepth()+1)."</ul>\n";
+               echo str_repeat('  ',$this->getDepth())."</ul>\n";
        }
        function valid()
        {

diff --git a/ext/spl/tests/iterator_016.phpt b/ext/spl/tests/iterator_016.phpt
index d30f8cd100dc283a584e6483a61e71e98a9e3843..6a811edf29a98a89c2004ad0da7803e941838f0d 100755 (executable)
--- a/ext/spl/tests/iterator_016.phpt
+++ b/ext/spl/tests/iterator_016.phpt
@@ -43,7 +43,7 @@ class MenuOutput extends RecursiveIteratorIterator
 
        function endChildren()
        {
-               echo str_repeat('  ',$this->getDepth()+1)."</ul>\n";
+               echo str_repeat('  ',$this->getDepth())."</ul>\n";
        }
        function valid()
        {

diff --git a/ext/spl/tests/iterator_021.phpt b/ext/spl/tests/iterator_021.phpt
index cb17907229477124df9a23ee8aec16888997a6bf..115461d05328ecd5a570709df71e194d19fc81d8 100755 (executable)
--- a/ext/spl/tests/iterator_021.phpt
+++ b/ext/spl/tests/iterator_021.phpt
@@ -113,7 +113,7 @@ foreach(new RecursiveArrayIteratorIterator(new RecursiveArrayIterator(array("a",
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 RecursiveArrayIteratorIterator::rewind
 RecursiveArrayIteratorIterator::callHasChildren(0) = no/no
 RecursiveArrayIteratorIterator::valid
@@ -146,7 +146,7 @@ RecursiveArrayIteratorIterator::key
 1=>bbb
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
 RecursiveArrayIteratorIterator::callHasChildren(1) = yes/yes
 RecursiveArrayIterator::getChildren
 RecursiveArrayIteratorIterator::beginChildren(2)
@@ -160,9 +160,9 @@ RecursiveArrayIteratorIterator::callHasChildren(2) = no/yes
 RecursiveArrayIteratorIterator::valid
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
 RecursiveArrayIteratorIterator::callHasChildren(0) = yes/yes
 RecursiveArrayIterator::getChildren
 RecursiveArrayIteratorIterator::beginChildren(1)
@@ -172,7 +172,7 @@ RecursiveArrayIteratorIterator::key
 0=>ca
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
 RecursiveArrayIteratorIterator::callHasChildren(0) = no/no
 RecursiveArrayIteratorIterator::valid
 RecursiveArrayIteratorIterator::current

diff --git a/ext/spl/tests/iterator_022.phpt b/ext/spl/tests/iterator_022.phpt
index 988eb62d3a1cb6bdd003bf432389df854e46ec79..12bec48b157cc555f1a73cd7d7a44b8a0cd02a1f 100755 (executable)
--- a/ext/spl/tests/iterator_022.phpt
+++ b/ext/spl/tests/iterator_022.phpt
@@ -132,7 +132,7 @@ catch(UnexpectedValueException $e)
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
+--EXPECT--
 RecursiveArrayIteratorIterator::rewind
 RecursiveArrayIteratorIterator::callHasChildren(0) = no/no
 RecursiveArrayIteratorIterator::valid
@@ -167,7 +167,7 @@ RecursiveArrayIteratorIterator::key
 1=>bbb
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
 RecursiveArrayIteratorIterator::callHasChildren(1) = yes/yes
 RecursiveArrayIteratorIterator::callGetChildren(ok:0)
 RecursiveArrayIteratorIterator::current
@@ -182,9 +182,9 @@ RecursiveArrayIteratorIterator::callHasChildren(2) = no/yes
 RecursiveArrayIteratorIterator::valid
 RecursiveArrayIteratorIterator::next
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
 RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
 RecursiveArrayIteratorIterator::callHasChildren(0) = yes/yes
 RecursiveArrayIteratorIterator::callGetChildren(skip)
 Objects returned by RecursiveIterator::getChildren() must implement RecursiveIterator