minor #27508 [Finder] Update RealIteratorTestCase (flip111)

nicolas-grekas · nicolas-grekas · commit 9f1d1d82fb02 · 2018-06-19T13:07:17.000+02:00
This PR was submitted for the master branch but it was squashed and merged into the 2.8 branch instead (closes #27508). Discussion ---------- [Finder] Update RealIteratorTestCase | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #27480 | License | MIT | Doc PR | n/a Makes the entire test directory empty instead of trying to delete particular files and directories. The old method failed when trying to remove a directory which was not empty. Commits ------- 7d0ebd4 [Finder] Update RealIteratorTestCase
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
@@ -60,11 +60,20 @@ public static function setUpBeforeClass()
 
     public static function tearDownAfterClass()
     {
-        foreach (array_reverse(self::$files) as $file) {
-            if (DIRECTORY_SEPARATOR === $file[strlen($file) - 1]) {
-                @rmdir($file);
+        $paths = new \RecursiveIteratorIterator(
+             new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),
+             \RecursiveIteratorIterator::CHILD_FIRST
+         );
+
+        foreach ($paths as $path) {
+            if ($path->isDir()) {
+                if ($path->isLink()) {
+                    @unlink($path);
+                } else {
+                    @rmdir($path);
+                }
             } else {
-                @unlink($file);
+                @unlink($path);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,20 @@ public static function setUpBeforeClass()`
`60`	`60`
`61`	`61`	`public static function tearDownAfterClass()`
`62`	`62`	`{`
`63`		`- foreach (array_reverse(self::$files) as $file) {`
`64`		`- if (DIRECTORY_SEPARATOR === $file[strlen($file) - 1]) {`
`65`		`- @rmdir($file);`
	`63`	`+ $paths = new \RecursiveIteratorIterator(`
	`64`	`+ new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),`
	`65`	`+ \RecursiveIteratorIterator::CHILD_FIRST`
	`66`	`+ );`
	`67`	`+`
	`68`	`+ foreach ($paths as $path) {`
	`69`	`+ if ($path->isDir()) {`
	`70`	`+ if ($path->isLink()) {`
	`71`	`+ @unlink($path);`
	`72`	`+ } else {`
	`73`	`+ @rmdir($path);`
	`74`	`+ }`
`66`	`75`	`} else {`
`67`		`- @unlink($file);`
	`76`	`+ @unlink($path);`
`68`	`77`	`}`
`69`	`78`	`}`
`70`	`79`	`}`