Permalink
Browse files

Merge branch 'PHP-5.4'

  • Loading branch information...
2 parents a7f7ac6 + 36c1024 commit d6ca1c9b9a5b9bb5e80ec2ed467288fd349f2fe4 @laruence laruence committed Sep 29, 2012
@@ -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==
+
@@ -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==

0 comments on commit d6ca1c9

Please sign in to comment.