Merge branch 'PHP-5.4'

* PHP-5.4:
  fix unix/win dir separators
This commit is contained in:
Anatoliy Belsky 2012-09-27 19:54:12 +02:00
commit 87df717909
2 changed files with 11 additions and 11 deletions

View File

@ -43,10 +43,10 @@ function rrmdir($dir) {
rrmdir($targetDir);
?>
--EXPECT--
--EXPECTF--
a0c967a6c2c34786e4802f59af9356f5
a0c967a6c2c34786e4802f59af9356f5
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507
a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507
==DONE==

View File

@ -44,15 +44,15 @@ function rrmdir($dir) {
$targetDir = __DIR__ . DIRECTORY_SEPARATOR . md5('recursiveDirectoryIterator::getSubPathname');
rrmdir($targetDir);
?>
--EXPECT--
--EXPECTF--
.
.
..
a0c967a6c2c34786e4802f59af9356f5/.
a0c967a6c2c34786e4802f59af9356f5/..
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/.
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/..
a0c967a6c2c34786e4802f59af9356f5/9925aabb545352472e4d77942627b507/getSubPathname_test_2.tmp
a0c967a6c2c34786e4802f59af9356f5/getSubPathname_test_3.tmp
a0c967a6c2c34786e4802f59af9356f5%c.
a0c967a6c2c34786e4802f59af9356f5%c..
a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c.
a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%c..
a0c967a6c2c34786e4802f59af9356f5%c9925aabb545352472e4d77942627b507%cgetSubPathname_test_2.tmp
a0c967a6c2c34786e4802f59af9356f5%cgetSubPathname_test_3.tmp
getSubPathname_test_1.tmp
==DONE==