Skip to content

Commit eb0c593

Browse files
vasileknik76Nikita Vasilchenko
authored andcommitted
Add trailing slash for deleteDir
1 parent b5c3c75 commit eb0c593

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/WebDAVAdapter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,8 @@ public function createDir($path, Config $config)
276276
*/
277277
public function deleteDir($dirname)
278278
{
279-
return $this->delete($dirname);
279+
$path = rtrim($dirname, $this->pathSeparator) . $this->pathSeparator;
280+
return $this->delete($path);
280281
}
281282

282283
/**

tests/WebDAVTests.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function testRenameFailException()
184184
public function testDeleteDir()
185185
{
186186
$mock = $this->getClient();
187-
$mock->shouldReceive('request')->with('DELETE', 'some/dirname')->once()->andReturn(['statusCode' => 200]);
187+
$mock->shouldReceive('request')->with('DELETE', 'some/dirname/')->once()->andReturn(['statusCode' => 200]);
188188
$adapter = new WebDAVAdapter($mock);
189189
$result = $adapter->deleteDir('some/dirname');
190190
$this->assertTrue($result);
@@ -193,7 +193,7 @@ public function testDeleteDir()
193193
public function testDeleteDirFailNotFound()
194194
{
195195
$mock = $this->getClient();
196-
$mock->shouldReceive('request')->with('DELETE', 'some/dirname')->once()->andThrow('Sabre\DAV\Exception\NotFound');
196+
$mock->shouldReceive('request')->with('DELETE', 'some/dirname/')->once()->andThrow('Sabre\DAV\Exception\NotFound');
197197
$adapter = new WebDAVAdapter($mock);
198198
$result = $adapter->deleteDir('some/dirname');
199199
$this->assertFalse($result);
@@ -202,7 +202,7 @@ public function testDeleteDirFailNotFound()
202202
public function testDeleteDirFailNot200Status()
203203
{
204204
$mock = $this->getClient();
205-
$mock->shouldReceive('request')->with('DELETE', 'some/dirname')->once()->andReturn(['statusCode' => 403]);
205+
$mock->shouldReceive('request')->with('DELETE', 'some/dirname/')->once()->andReturn(['statusCode' => 403]);
206206
$adapter = new WebDAVAdapter($mock);
207207
$result = $adapter->deleteDir('some/dirname');
208208
$this->assertFalse($result);

0 commit comments

Comments
 (0)