Add trailing slash for deleteDir

thephpleague · Sep 3, 2020 · eb0c593 · eb0c593
1 parent b5c3c75
commit eb0c593
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/WebDAVAdapter.php b/src/WebDAVAdapter.php
@@ -276,7 +276,8 @@ public function createDir($path, Config $config)
      */
     public function deleteDir($dirname)
     {
-        return $this->delete($dirname);
+        $path = rtrim($dirname, $this->pathSeparator) . $this->pathSeparator;
+        return $this->delete($path);
     }
 
     /**

diff --git a/tests/WebDAVTests.php b/tests/WebDAVTests.php
@@ -184,7 +184,7 @@ public function testRenameFailException()
     public function testDeleteDir()
     {
         $mock = $this->getClient();
-        $mock->shouldReceive('request')->with('DELETE', 'some/dirname')->once()->andReturn(['statusCode' => 200]);
+        $mock->shouldReceive('request')->with('DELETE', 'some/dirname/')->once()->andReturn(['statusCode' => 200]);
         $adapter = new WebDAVAdapter($mock);
         $result = $adapter->deleteDir('some/dirname');
         $this->assertTrue($result);
@@ -193,7 +193,7 @@ public function testDeleteDir()
     public function testDeleteDirFailNotFound()
     {
         $mock = $this->getClient();
-        $mock->shouldReceive('request')->with('DELETE', 'some/dirname')->once()->andThrow('Sabre\DAV\Exception\NotFound');
+        $mock->shouldReceive('request')->with('DELETE', 'some/dirname/')->once()->andThrow('Sabre\DAV\Exception\NotFound');
         $adapter = new WebDAVAdapter($mock);
         $result = $adapter->deleteDir('some/dirname');
         $this->assertFalse($result);
@@ -202,7 +202,7 @@ public function testDeleteDirFailNotFound()
     public function testDeleteDirFailNot200Status()
     {
         $mock = $this->getClient();
-        $mock->shouldReceive('request')->with('DELETE', 'some/dirname')->once()->andReturn(['statusCode' => 403]);
+        $mock->shouldReceive('request')->with('DELETE', 'some/dirname/')->once()->andReturn(['statusCode' => 403]);
         $adapter = new WebDAVAdapter($mock);
         $result = $adapter->deleteDir('some/dirname');
         $this->assertFalse($result);