Skip to content

Commit c49ecdc

Browse files
committed
fix(Storage): Fix getDirectoryContent() return type
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent 3a86581 commit c49ecdc

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

lib/private/Files/Storage/Common.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
750750
return $count;
751751
}
752752

753-
public function getDirectoryContent($directory): \Traversable|false {
753+
public function getDirectoryContent($directory): \Traversable {
754754
$dh = $this->opendir($directory);
755755

756756
if ($dh === false) {

lib/private/Files/Storage/Storage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ public function getMetaData($path): ?array;
7272
* - storage_mtime
7373
* - permissions
7474
*/
75-
public function getDirectoryContent($directory): \Traversable|false;
75+
public function getDirectoryContent($directory): \Traversable;
7676
}

lib/private/Files/Storage/Wrapper/Availability.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,13 @@ protected function setUnavailable(?StorageNotAvailableException $e): void {
438438

439439

440440

441-
public function getDirectoryContent($directory): \Traversable|false {
441+
public function getDirectoryContent($directory): \Traversable {
442442
$this->checkAvailability();
443443
try {
444444
return parent::getDirectoryContent($directory);
445445
} catch (StorageNotAvailableException $e) {
446446
$this->setUnavailable($e);
447-
return false;
447+
yield;
448448
}
449449
}
450450
}

lib/private/Files/Storage/Wrapper/Jail.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
262262
}
263263
}
264264

265-
public function getDirectoryContent($directory): \Traversable|false {
265+
public function getDirectoryContent($directory): \Traversable {
266266
return $this->getWrapperStorage()->getDirectoryContent($this->getUnjailedPath($directory));
267267
}
268268
}

lib/private/Files/Storage/Wrapper/Wrapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
331331
}
332332
}
333333

334-
public function getDirectoryContent($directory): \Traversable|false {
334+
public function getDirectoryContent($directory): \Traversable {
335335
return $this->getWrapperStorage()->getDirectoryContent($directory);
336336
}
337337

0 commit comments

Comments
 (0)