remove dir

doganoo · Oct 12, 2019 · 31dc875 · 31dc875
1 parent ca4a5b1
commit 31dc875
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/FileSystem/DirHandler.php b/src/FileSystem/DirHandler.php
@@ -251,21 +251,21 @@ public function deleteFile(string $name): bool {
      * @param string|null $name
      * @return bool
      */
-    public function rmdir(string $name = null): bool {
-        $iterator = new RecursiveDirectoryIterator(
+    public function rmdir(): bool {
+        $itemsDeleted = false;
+        $iterator     = new RecursiveDirectoryIterator(
             $this->getPath()
         );
 
         /** @var SplFileInfo $item */
         foreach ($iterator as $item) {
-            if (false === $item->isDir()) continue;
-            if ($item->getBasename() === $name) {
-                unlink($item->getRealPath());
-                return true;
-            }
+            $itemDeleted  = unlink($item->getRealPath());
+            $itemsDeleted = $itemsDeleted && $itemDeleted;
         }
 
-        return false;
+        $pathDeleted = unlink($this->getPath());
+
+        return true === $itemsDeleted && true === $pathDeleted;
     }
 
 }