diff options
| -rwxr-xr-x | ext/spl/tests/iterator_014.phpt | 10 | ||||
| -rwxr-xr-x | ext/spl/tests/iterator_015.phpt | 2 | ||||
| -rwxr-xr-x | ext/spl/tests/iterator_016.phpt | 2 | ||||
| -rwxr-xr-x | ext/spl/tests/iterator_021.phpt | 10 | ||||
| -rwxr-xr-x | ext/spl/tests/iterator_022.phpt | 8 |
5 files changed, 16 insertions, 16 deletions
diff --git a/ext/spl/tests/iterator_014.phpt b/ext/spl/tests/iterator_014.phpt index ff8bb2cf01..f6e8ce9d01 100755 --- 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 a617e64638..3a18efd80f 100755 --- 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 d30f8cd100..6a811edf29 100755 --- 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 cb17907229..115461d053 100755 --- 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 988eb62d3a..12bec48b15 100755 --- 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 |