upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-29 10:03:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #48454 from nextcloud/fix/storage/get-directory-content-return-type

Browse source
This commit is contained in:
Kate 2024-10-01 16:22:16 +02:00 committed by GitHub
commit 26762172f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Files/Storage/Common.php
View file

@ -762,7 +762,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) {

2
lib/private/Files/Storage/Storage.php
View file

@ -72,5 +72,5 @@ interface Storage extends IStorage, ILockingStorage {
* - storage_mtime
* - permissions
*/
public function getDirectoryContent($directory): \Traversable|false;
public function getDirectoryContent($directory): \Traversable;
}

4
lib/private/Files/Storage/Wrapper/Availability.php
View file

@ -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();
}
}
}

2
lib/private/Files/Storage/Wrapper/Jail.php
View file

@ -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));
}
}

2
lib/private/Files/Storage/Wrapper/Wrapper.php
View file

@ -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);
}