summaryrefslogtreecommitdiff
path: root/ext/spl
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-10-01 22:45:15 +0800
committerXinchen Hui <laruence@php.net>2012-10-01 22:45:15 +0800
commita81d4310682f879aad5a156f8ac42e8080306082 (patch)
tree01d5a8c874b3e6118cf94bee77853c4a8fa2b038 /ext/spl
parent0a3b6e4ee9fcc4d5625b384c50f4aa8dca30d415 (diff)
parent139ac42bec942639db2f52ae16700e491114c898 (diff)
downloadphp-git-a81d4310682f879aad5a156f8ac42e8080306082.tar.gz
Merge branch 'PHP-5.4'
Diffstat (limited to 'ext/spl')
-rw-r--r--ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
index e08bd3435f..7b12672e14 100644
--- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
+++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt
@@ -17,6 +17,7 @@ $iterator = new RecursiveDirectoryIterator(__DIR__ . DIRECTORY_SEPARATOR . $dept
$it = new RecursiveIteratorIterator($iterator);
$list = [];
+$it->rewind(); //see https://bugs.php.net/bug.php?id=62914
while($it->valid()) {
$list[] = $it->getSubPathname();
$it->next();
@@ -46,7 +47,6 @@ rrmdir($targetDir);
--EXPECTF--
.
..
-..
depth1%c.
depth1%c..
depth1%cdepth2%c.