Merge pull request #32 from chapeupreto/master

Delete directories using FilesystemIterator
spatie · Aug 28, 2019 · 007f8e2 · 007f8e2
2 parents 8a23b99 + 6f7b74a
commit 007f8e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/TemporaryDirectory.php b/src/TemporaryDirectory.php
@@ -3,6 +3,7 @@
 namespace Spatie\TemporaryDirectory;
 
 use Exception;
+use FilesystemIterator;
 use InvalidArgumentException;
 
 class TemporaryDirectory
@@ -150,12 +151,8 @@ protected function deleteDirectory(string $path): bool
             return unlink($path);
         }
 
-        foreach (scandir($path) as $item) {
-            if ($item == '.' || $item == '..') {
-                continue;
-            }
-
-            if (! $this->deleteDirectory($path.DIRECTORY_SEPARATOR.$item)) {
+        foreach (new FilesystemIterator($path) as $item) {
+            if (! $this->deleteDirectory($item)) {
                 return false;
             }
         }

diff --git a/tests/TemporaryDirectoryTest.php b/tests/TemporaryDirectoryTest.php
@@ -2,6 +2,7 @@
 
 namespace Spatie\TemporaryDirectory\Test;
 
+use FilesystemIterator;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
@@ -259,12 +260,8 @@ protected function deleteDirectory(string $path): bool
             return unlink($path);
         }
 
-        foreach (scandir($path) as $item) {
-            if ($item == '.' || $item == '..') {
-                continue;
-            }
-
-            if (! $this->deleteDirectory($path.DIRECTORY_SEPARATOR.$item)) {
+        foreach (new FilesystemIterator($path) as $item) {
+            if (! $this->deleteDirectory($item)) {
                 return false;
             }
         }