Make rmdir recursive for local storage

Backport of 63c898c0

diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index f4d7626219b61e515e51ca49ceda242cddf05a39..a6fe01c63d68856e4bba23b21e7577174a551879 100644 (file)
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -34,7 +34,27 @@ class Local extends \OC\Files\Storage\Common{
                return @mkdir($this->datadir.$path);
        }
        public function rmdir($path) {
-               return @rmdir($this->datadir.$path);
+               try {
+                       $it = new \RecursiveIteratorIterator(
+                               new \RecursiveDirectoryIterator($this->datadir . $path),
+                               \RecursiveIteratorIterator::CHILD_FIRST
+                       );
+                       foreach ($it as $file) {
+                               /**
+                                * @var \SplFileInfo $file
+                                */
+                               if (in_array($file->getBasename(), array('.', '..'))) {
+                                       continue;
+                               } elseif ($file->isDir()) {
+                                       rmdir($file->getPathname());
+                               } elseif ($file->isFile() || $file->isLink()) {
+                                       unlink($file->getPathname());
+                               }
+                       }
+                       return rmdir($this->datadir . $path);
+               } catch (\UnexpectedValueException $e) {
+                       return false;
+               }
        }
        public function opendir($path) {
                return opendir($this->datadir.$path);

diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index ea3ca7d19e05468e049a1b11ae7bd3a279e586c0..9ee49f8040014ea41b8f9be44a62a9d0515efd75 100644 (file)
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -281,7 +281,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
                $this->assertEquals(file_get_contents($textFile), $content);
        }
 
-       public function testTouchCreateFile(){
+       public function testTouchCreateFile() {
                $this->assertFalse($this->instance->file_exists('foo'));
                $this->instance->touch('foo');
                $this->assertTrue($this->instance->file_exists('foo'));