fix(Storage): Fix getDirectoryContent() return type

Signed-off-by: provokateurin <kate@provokateurin.de>

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index d78a6ca1ab35e89b3a8bda9a251c20688ce9a294..746fe17d7c0478434c19d982fb4065ec6f200a15 100644 (file)
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -750,7 +750,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage,
                return $count;
        }
 
-       public function getDirectoryContent($directory): \Traversable|false {
+       public function getDirectoryContent($directory): \Traversable {
                $dh = $this->opendir($directory);
 
                if ($dh === false) {

diff --git a/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php
index 741100ca117e6d696bddde7b586ad15e4b6f2b20..3b14b1b84e36bb1e3969b836178c2ce6a0eeadbf 100644 (file)
--- a/lib/private/Files/Storage/Storage.php
+++ b/lib/private/Files/Storage/Storage.php
@@ -72,5 +72,5 @@ interface Storage extends IStorage, ILockingStorage {
         * - storage_mtime
         * - permissions
         */
-       public function getDirectoryContent($directory): \Traversable|false;
+       public function getDirectoryContent($directory): \Traversable;
 }

diff --git a/lib/private/Files/Storage/Wrapper/Availability.php b/lib/private/Files/Storage/Wrapper/Availability.php
index a29239d034b13945c480bf86cf262d9737cd01f5..1a2824614c1e249ab4d4e1db16f91caa1e3f7b9b 100644 (file)
--- a/lib/private/Files/Storage/Wrapper/Availability.php
+++ b/lib/private/Files/Storage/Wrapper/Availability.php
@@ -438,13 +438,13 @@ class Availability extends Wrapper {
 
 
 
-       public function getDirectoryContent($directory): \Traversable|false {
+       public function getDirectoryContent($directory): \Traversable {
                $this->checkAvailability();
                try {
                        return parent::getDirectoryContent($directory);
                } catch (StorageNotAvailableException $e) {
                        $this->setUnavailable($e);
-                       return false;
+                       return new \EmptyIterator();
                }
        }
 }

diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
index d0cf1c42236e82162de0b15cf07513e2923866ae..256d669ede78dbf658e5c014c39ba71b7a1dff6a 100644 (file)
--- a/lib/private/Files/Storage/Wrapper/Jail.php
+++ b/lib/private/Files/Storage/Wrapper/Jail.php
@@ -262,7 +262,7 @@ class Jail extends Wrapper {
                }
        }
 
-       public function getDirectoryContent($directory): \Traversable|false {
+       public function getDirectoryContent($directory): \Traversable {
                return $this->getWrapperStorage()->getDirectoryContent($this->getUnjailedPath($directory));
        }
 }

diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php
index 655bbc7ef75f499c3108185011aea1c810f71d9a..903f6e5e470a6b88ad7a10e3f897627d6d65cd91 100644 (file)
--- a/lib/private/Files/Storage/Wrapper/Wrapper.php
+++ b/lib/private/Files/Storage/Wrapper/Wrapper.php
@@ -331,7 +331,7 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage, IWriteStrea
                }
        }
 
-       public function getDirectoryContent($directory): \Traversable|false {
+       public function getDirectoryContent($directory): \Traversable {
                return $this->getWrapperStorage()->getDirectoryContent($directory);
        }