Filesystem error handling

1 files changed, 14 insertions, 7 deletions

diff --git a/app/Http/RequestHandlers/CleanDataFolder.php b/app/Http/RequestHandlers/CleanDataFolder.php
index b3e0c9bb1d..4a0ae7ca7c 100644
--- a/app/Http/RequestHandlers/CleanDataFolder.php
+++ b/app/Http/RequestHandlers/CleanDataFolder.php
@@ -24,6 +24,7 @@ use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
 use League\Flysystem\Filesystem;
+use League\Flysystem\FilesystemException;
 use League\Flysystem\StorageAttributes;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -82,14 +83,20 @@ class CleanDataFolder implements RequestHandlerInterface
         }
 
         // List the top-level contents of the data folder
-        $entries = $data_filesystem->listContents('', Filesystem::LIST_SHALLOW)
-            ->map(static function (StorageAttributes $attributes): string {
-                if ($attributes->isDir()) {
-                    return $attributes->path() . '/';
-                }
+        try {
+            $entries = $data_filesystem->listContents('', Filesystem::LIST_SHALLOW)
+                ->map(static function (StorageAttributes $attributes): string {
+                    if ($attributes->isDir()) {
+                        return $attributes->path() . '/';
+                    }
+
+                    return $attributes->path();
+                })
+                ->toArray();
+        } catch (FilesystemException $ex) {
+            $entries = [];
+        }
 
-                return $attributes->path();
-            });
 
         return $this->viewResponse('admin/clean-data', [
             'title'     => I18N::translate('Clean up data folder'),