Commit: 36c10242cd3babee807178def14485bd4b13bbc6 Author: Xinchen Hui <larue...@php.net> Sat, 29 Sep 2012 14:38:29 +0800 Parents: f495e9305716a6b2ce448e56cf463169b196d08c Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=36c10242cd3babee807178def14485bd4b13bbc6 Log: Remove meaningless md5 string && Attempt to fix #63184 Bugs: https://bugs.php.net/63184 Changed paths: M ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt M ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt Diff: diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt index a4b0073..1602da5 100644 --- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt +++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPath_basic.phpt @@ -5,9 +5,9 @@ Pawel Krynicki <pawel [dot] krynicki [at] xsolve [dot] pl> #testfest AmsterdamPHP 2012-06-23 --FILE-- <?php -$depth0 = md5('recursiveDirectoryIterator::getSubPath'); -$depth1 = md5('depth1'); -$depth2 = md5('depth2'); +$depth0 = "depth0"; +$depth1 = 'depth1'; +$depth2 = 'depth2'; $targetDir = __DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . $depth1 . DIRECTORY_SEPARATOR . $depth2; mkdir($targetDir, 0777, true); touch($targetDir . DIRECTORY_SEPARATOR . 'getSubPath_test.tmp'); @@ -24,29 +24,29 @@ foreach ($list as $item) { echo $item . "\n"; } ?> -==DONE== --CLEAN-- <?php function rrmdir($dir) { - foreach(glob($dir . '/*') as $file) { - if(is_dir($file)) { + foreach(glob($dir . '/*') as $file) { + if(is_dir($file)) { rrmdir($file); - } else { + } else { unlink($file); - } - } + } + } - rmdir($dir); - } + rmdir($dir); +} - $targetDir = __DIR__.DIRECTORY_SEPARATOR.md5('recursiveDirectoryIterator::getSubPath'); - rrmdir($targetDir); +$targetDir = __DIR__.DIRECTORY_SEPARATOR . "depth0"; +rrmdir($targetDir); ?> --EXPECTF-- -a0c967a6c2c34786e4802f59af9356f5 -a0c967a6c2c34786e4802f59af9356f5 -a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507 -a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507 -a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507 +depth1 +depth1 +depth1%cdepth2 +depth1%cdepth2 +depth1%cdepth2 ==DONE== + diff --git a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt index 5c294a9..e08bd34 100644 --- a/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt +++ b/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt @@ -5,9 +5,9 @@ Pawel Krynicki <pawel [dot] krynicki [at] xsolve [dot] pl> #testfest AmsterdamPHP 2012-06-23 --FILE-- <?php -$depth0 = md5('recursiveDirectoryIterator::getSubPathname'); -$depth1 = md5('depth1'); -$depth2 = md5('depth2'); +$depth0 = "depth0"; +$depth1 = "depth1"; +$depth2 = "depth2"; $targetDir = __DIR__ . DIRECTORY_SEPARATOR . $depth0 . DIRECTORY_SEPARATOR . $depth1 . DIRECTORY_SEPARATOR . $depth2; mkdir($targetDir, 0777, true); touch($targetDir . DIRECTORY_SEPARATOR . 'getSubPathname_test_2.tmp'); @@ -26,7 +26,6 @@ foreach ($list as $item) { echo $item . "\n"; } ?> -==DONE== --CLEAN-- <?php function rrmdir($dir) { @@ -41,18 +40,17 @@ function rrmdir($dir) { rmdir($dir); } -$targetDir = __DIR__ . DIRECTORY_SEPARATOR . md5('recursiveDirectoryIterator::getSubPathname'); +$targetDir = __DIR__ . DIRECTORY_SEPARATOR . "depth0"; rrmdir($targetDir); ?> --EXPECTF-- . -. .. -a0c967a6c2c34786e4802f59af9356f5%c. -a0c967a6c2c34786e4802f59af9356f5%c.. -a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c. -a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c.. -a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%cgetSubPathname_test_2.tmp -a0c967a6c2c34786e4802f59af9356f5%cgetSubPathname_test_3.tmp +.. +depth1%c. +depth1%c.. +depth1%cdepth2%c. +depth1%cdepth2%c.. +depth1%cdepth2%cgetSubPathname_test_2.tmp +depth1%cgetSubPathname_test_3.tmp getSubPathname_test_1.tmp -==DONE== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
