diff --git a/lib/ACL/ACLStorageWrapper.php b/lib/ACL/ACLStorageWrapper.php index 441f06373..c862a2019 100644 --- a/lib/ACL/ACLStorageWrapper.php +++ b/lib/ACL/ACLStorageWrapper.php @@ -300,11 +300,8 @@ public function getDirectDownload($path): array|false { return parent::getDirectDownload($path); } - public function getDirectoryContent($directory): \Traversable|false { + public function getDirectoryContent($directory): \Traversable { $content = $this->getWrapperStorage()->getDirectoryContent($directory); - if ($content === false) { - return false; - } foreach ($content as $data) { $data['scan_permissions'] ??= $data['permissions']; $data['permissions'] &= $this->getACLPermissionsForPath(rtrim($directory, '/') . '/' . $data['name']); diff --git a/tests/stubs/oc_files_node_lazyfolder.php b/tests/stubs/oc_files_node_lazyfolder.php index 521bc9a9c..b35dd5221 100644 --- a/tests/stubs/oc_files_node_lazyfolder.php +++ b/tests/stubs/oc_files_node_lazyfolder.php @@ -127,9 +127,6 @@ public function unMount($mount) { } - /** - * @inheritDoc - */ public function get($path) { } @@ -362,9 +359,6 @@ public function getDirectoryListing() { } - /** - * @inheritDoc - */ public function nodeExists($path) { } diff --git a/tests/stubs/oc_files_objectstore_objectstorestorage.php b/tests/stubs/oc_files_objectstore_objectstorestorage.php index e9c888a7e..4ccd00c56 100644 --- a/tests/stubs/oc_files_objectstore_objectstorestorage.php +++ b/tests/stubs/oc_files_objectstore_objectstorestorage.php @@ -171,5 +171,9 @@ public function completeChunkedWrite(string $targetPath, string $writeToken): in public function cancelChunkedWrite(string $targetPath, string $writeToken): void { + } + + public function setPreserveCacheOnDelete(bool $preserve) + { } } diff --git a/tests/stubs/oc_files_storage_common.php b/tests/stubs/oc_files_storage_common.php index c4cefe6d2..8b542e308 100644 --- a/tests/stubs/oc_files_storage_common.php +++ b/tests/stubs/oc_files_storage_common.php @@ -15,6 +15,7 @@ use OC\Files\Cache\Watcher; use OC\Files\FilenameValidator; use OC\Files\Filesystem; +use OC\Files\ObjectStore\ObjectStoreStorage; use OC\Files\Storage\Wrapper\Jail; use OC\Files\Storage\Wrapper\Wrapper; use OCP\Files\Cache\ICache; @@ -319,7 +320,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int { } - public function getDirectoryContent($directory): \Traversable|false + public function getDirectoryContent($directory): \Traversable { } } diff --git a/tests/stubs/oc_files_storage_storage.php b/tests/stubs/oc_files_storage_storage.php index 0c4dde003..c5f0929d4 100644 --- a/tests/stubs/oc_files_storage_storage.php +++ b/tests/stubs/oc_files_storage_storage.php @@ -86,7 +86,7 @@ public function getMetaData($path): ?array * - storage_mtime * - permissions */ - public function getDirectoryContent($directory): \Traversable|false + public function getDirectoryContent($directory): \Traversable { } } diff --git a/tests/stubs/oc_files_storage_wrapper_jail.php b/tests/stubs/oc_files_storage_wrapper_jail.php index 79e093556..4ba274ed5 100644 --- a/tests/stubs/oc_files_storage_wrapper_jail.php +++ b/tests/stubs/oc_files_storage_wrapper_jail.php @@ -228,7 +228,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int { } - public function getDirectoryContent($directory): \Traversable|false + public function getDirectoryContent($directory): \Traversable { } } diff --git a/tests/stubs/oc_files_storage_wrapper_wrapper.php b/tests/stubs/oc_files_storage_wrapper_wrapper.php index 22ddd1830..9f5f79038 100644 --- a/tests/stubs/oc_files_storage_wrapper_wrapper.php +++ b/tests/stubs/oc_files_storage_wrapper_wrapper.php @@ -272,7 +272,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int { } - public function getDirectoryContent($directory): \Traversable|false + public function getDirectoryContent($directory): \Traversable { }