Merge pull request #48454 from nextcloud/fix/storage/get-directory-co…

…ntent-return-type
nextcloud · Oct 1, 2024 · 2676217 · 2676217
2 parents 7f7a3cd + e1998b6
commit 2676217
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -762,7 +762,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
 		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
@@ -72,5 +72,5 @@ public function getMetaData($path): ?array;
 	 * - 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
@@ -438,13 +438,13 @@ protected function setUnavailable(?StorageNotAvailableException $e): void {
 
 
 
-	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
@@ -262,7 +262,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
 		}
 	}
 
-	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
@@ -331,7 +331,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
 		}
 	}
 
-	public function getDirectoryContent($directory): \Traversable|false {
+	public function getDirectoryContent($directory): \Traversable {
 		return $this->getWrapperStorage()->getDirectoryContent($directory);
 	}