Merge pull request #22 from jeroenlammerts/master

Fix deleteDir removes other files/dirs #19
chrisnharvey · Dec 6, 2020 · 41e3ea0 · 41e3ea0
2 parents 63cf62d + cd02e4b
commit 41e3ea0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/SwiftAdapter.php b/src/SwiftAdapter.php
@@ -131,6 +131,14 @@ public function delete($path)
      */
     public function deleteDir($dirname)
     {
+        // Make sure a slash is added to the end.
+        $dirname = rtrim(trim($dirname), '/') . '/';
+
+        // To be safe, don't delete everything.
+        if($dirname === '/') {
+            return false;
+        }
+
         $objects = $this->container->listObjects([
             'prefix' => $this->applyPathPrefix($dirname)
         ]);

diff --git a/tests/SwiftAdapterTest.php b/tests/SwiftAdapterTest.php
@@ -177,7 +177,7 @@ public function testDeleteDir()
         $this->container->shouldReceive('listObjects')
             ->once()
             ->with([
-                'prefix' => 'hello'
+                'prefix' => 'hello/'
             ])
             ->andReturn($objects);