3 files changed, 9 insertions, 27 deletions

diff --git a/app/Http/RequestHandlers/ExportGedcomClient.php b/app/Http/RequestHandlers/ExportGedcomClient.php
index bdeae8562f..a11ec426e0 100644
--- a/app/Http/RequestHandlers/ExportGedcomClient.php
+++ b/app/Http/RequestHandlers/ExportGedcomClient.php
@@ -30,15 +30,12 @@ use League\Flysystem\Filesystem;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\ZipArchive\FilesystemZipArchiveProvider;
 use League\Flysystem\ZipArchive\ZipArchiveAdapter;
-use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use RuntimeException;
 
 use function addcslashes;
-use function app;
 use function assert;
 use function fclose;
 use function fopen;
@@ -151,16 +148,11 @@ class ExportGedcomClient implements RequestHandlerInterface
             }
 
             // Use a stream, so that we do not have to load the entire file into memory.
-            $stream_factory = app(StreamFactoryInterface::class);
-            assert($stream_factory instanceof StreamFactoryInterface);
+            $http_stream = Registry::streamFactory()->createStreamFromFile($temp_zip_file);
+            $filename    = addcslashes($download_filename, '"') . '.zip';
 
-            $http_stream   = $stream_factory->createStreamFromFile($temp_zip_file);
-            $filename = addcslashes($download_filename, '"') . '.zip';
-
-            /** @var ResponseFactoryInterface $response_factory */
-            $response_factory = app(ResponseFactoryInterface::class);
-
-            return $response_factory->createResponse()
+            return Registry::responseFactory()
+                ->createResponse()
                 ->withBody($http_stream)
                 ->withHeader('Content-Type', 'application/zip')
                 ->withHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
@@ -177,15 +169,10 @@ class ExportGedcomClient implements RequestHandlerInterface
 
         $charset = $convert ? 'ISO-8859-1' : 'UTF-8';
 
-        $stream_factory = app(StreamFactoryInterface::class);
-        assert($stream_factory instanceof StreamFactoryInterface);
-
-        $http_stream = $stream_factory->createStreamFromResource($resource);
-
-        /** @var ResponseFactoryInterface $response_factory */
-        $response_factory = app(ResponseFactoryInterface::class);
+        $http_stream = Registry::streamFactory()->createStreamFromResource($resource);
 
-        return $response_factory->createResponse()
+        return Registry::responseFactory()
+            ->createResponse()
             ->withBody($http_stream)
             ->withHeader('Content-Type', 'text/x-gedcom; charset=' . $charset)
             ->withHeader('Content-Disposition', 'attachment; filename="' . addcslashes($download_filename, '"') . '"');
diff --git a/app/Http/RequestHandlers/ImportGedcomAction.php b/app/Http/RequestHandlers/ImportGedcomAction.php
index 439865f5b3..cb211a97cf 100644
--- a/app/Http/RequestHandlers/ImportGedcomAction.php
+++ b/app/Http/RequestHandlers/ImportGedcomAction.php
@@ -30,10 +30,8 @@ use League\Flysystem\UnableToReadFile;
 use Nyholm\Psr7\UploadedFile;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function app;
 use function assert;
 use function basename;
 use function redirect;
@@ -98,7 +96,7 @@ class ImportGedcomAction implements RequestHandlerInterface
 
             if ($basename) {
                 $resource = $data_filesystem->readStream($basename);
-                $stream   = app(StreamFactoryInterface::class)->createStreamFromResource($resource);
+                $stream   = Registry::streamFactory()->createStreamFromResource($resource);
                 $this->tree_service->importGedcomFile($tree, $stream, $basename);
             } else {
                 FlashMessages::addMessage(I18N::translate('No GEDCOM file was received.'), 'danger');
diff --git a/app/Http/RequestHandlers/SynchronizeTrees.php b/app/Http/RequestHandlers/SynchronizeTrees.php
index 55d97426c9..91bfdc56f4 100644
--- a/app/Http/RequestHandlers/SynchronizeTrees.php
+++ b/app/Http/RequestHandlers/SynchronizeTrees.php
@@ -26,9 +26,6 @@ use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\AdminService;
 use Fisharebest\Webtrees\Services\TimeoutService;
 use Fisharebest\Webtrees\Services\TreeService;
-use League\Flysystem\FilesystemException;
-use League\Flysystem\UnableToReadFile;
-use League\Flysystem\UnableToRetrieveMetadata;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
@@ -89,7 +86,7 @@ class SynchronizeTrees implements RequestHandlerInterface
 
                 if ($tree->getPreference('filemtime') !== $filemtime) {
                     $resource = $data_filesystem->readStream($gedcom_file);
-                    $stream   = app(StreamFactoryInterface::class)->createStreamFromResource($resource);
+                    $stream   = Registry::streamFactory()->createStreamFromResource($resource);
                     $this->tree_service->importGedcomFile($tree, $stream, $gedcom_file);
                     $stream->close();
                     $tree->setPreference('filemtime', $filemtime);