Also delete parent directory in ZipArchive implementation

shitware-ltd · Jan 15, 2022 · 03592e7 · 03592e7
1 parent ea4542a
commit 03592e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/ZipArchive/ZipArchiveAdapter.php b/src/ZipArchive/ZipArchiveAdapter.php
@@ -30,7 +30,6 @@
 use function fopen;
 use function rewind;
 use function stream_copy_to_stream;
-use function stream_with_contents;
 
 final class ZipArchiveAdapter implements FilesystemAdapter
 {
@@ -161,7 +160,7 @@ public function deleteDirectory(string $path): void
 
             $itemPath = $stats['name'];
 
-            if ($prefixedPath === $itemPath || strpos($itemPath, $prefixedPath) !== 0) {
+            if (strpos($itemPath, $prefixedPath) !== 0) {
                 continue;
             }
 

diff --git a/src/ZipArchive/ZipArchiveAdapterTest.php b/src/ZipArchive/ZipArchiveAdapterTest.php
@@ -136,7 +136,7 @@ public function deleting_a_directory(): void
         $this->adapter()->deleteDirectory('one');
 
         $items = iterator_to_array($this->adapter()->listContents('', true));
-        $this->assertCount(4, $items);
+        $this->assertCount(3, $items);
     }
 
     /**