Fix: #2479 - admin manage media showing wrong files; Attach filesystems to request

20 files changed, 172 insertions, 82 deletions

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0f51325669..c01c33fd49 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -36,7 +36,7 @@ use Illuminate\Database\Capsule\Manager as DB;
 use Illuminate\Database\Query\Builder;
 use League\Flysystem\Filesystem;
 use League\Flysystem\FilesystemInterface;
-use League\Flysystem\Memory\MemoryAdapter;
+use League\Flysystem\Memory\NullAdapter;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ServerRequestFactoryInterface;
@@ -83,7 +83,6 @@ class TestCase extends \PHPUnit\Framework\TestCase
         // Disable the cache.
         app()->instance('cache.array', new Repository(new NullStore()));
 
-        app()->instance(FilesystemInterface::class, new Filesystem(new MemoryAdapter()));
         app()->bind(ModuleThemeInterface::class, WebtreesTheme::class);
 
         // Need the routing table, to generate URLs.
diff --git a/tests/app/Http/Controllers/Admin/MediaControllerTest.php b/tests/app/Http/Controllers/Admin/MediaControllerTest.php
index 5a296a4b72..25a72f18ce 100644
--- a/tests/app/Http/Controllers/Admin/MediaControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/MediaControllerTest.php
@@ -23,8 +23,8 @@ use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\DatatablesService;
 use Fisharebest\Webtrees\TestCase;
+use League\Flysystem\Adapter\NullAdapter;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Memory\MemoryAdapter;
 
 /**
  * Test MediaController class.
@@ -40,10 +40,11 @@ class MediaControllerTest extends TestCase
      */
     public function testIndex(): void
     {
+        $data_filesystem    = new Filesystem(new NullAdapter());
         $datatables_service = new DatatablesService();
-        $filesystem         = new Filesystem(new MemoryAdapter());
+        $filesystem         = new Filesystem(new NullAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest();
+        $request            = self::createRequest()->withAttribute('filesystem.data', $data_filesystem);
         $response           = $controller->index($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -55,7 +56,7 @@ class MediaControllerTest extends TestCase
     public function testDataLocal(): void
     {
         $datatables_service = new DatatablesService();
-        $filesystem         = new Filesystem(new MemoryAdapter());
+        $filesystem         = new Filesystem(new NullAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
         $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'files'        => 'local',
@@ -76,7 +77,7 @@ class MediaControllerTest extends TestCase
     public function testDataExternal(): void
     {
         $datatables_service = new DatatablesService();
-        $filesystem         = new Filesystem(new MemoryAdapter());
+        $filesystem         = new Filesystem(new NullAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
         $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'files'        => 'local',
@@ -97,7 +98,7 @@ class MediaControllerTest extends TestCase
     public function testDataUnused(): void
     {
         $datatables_service = new DatatablesService();
-        $filesystem         = new Filesystem(new MemoryAdapter());
+        $filesystem         = new Filesystem(new NullAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
         $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'files'        => 'local',
@@ -118,9 +119,10 @@ class MediaControllerTest extends TestCase
     public function testDelete(): void
     {
         $datatables_service = new DatatablesService();
-        $filesystem         = new Filesystem(new MemoryAdapter());
-        $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest(RequestMethodInterface::METHOD_POST, ['file' => 'foo', 'folder' => 'bar']);
+        $data_filesystem    = new Filesystem(new NullAdapter());
+        $controller         = new MediaController($datatables_service);
+        $request            = self::createRequest(RequestMethodInterface::METHOD_POST, ['file' => 'foo', 'folder' => 'bar'])
+            ->withAttribute('filesystem.data', $data_filesystem);
         $response           = $controller->delete($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
@@ -132,9 +134,9 @@ class MediaControllerTest extends TestCase
     public function testUpload(): void
     {
         $datatables_service = new DatatablesService();
-        $filesystem         = new Filesystem(new MemoryAdapter());
-        $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest();
+        $data_filesystem    = new Filesystem(new NullAdapter());
+        $controller         = new MediaController($datatables_service);
+        $request            = self::createRequest()->withAttribute('filesystem.data', $data_filesystem);
         $response           = $controller->upload($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -145,10 +147,11 @@ class MediaControllerTest extends TestCase
      */
     public function testUploadAction(): void
     {
+        $data_filesystem    = new Filesystem(new NullAdapter());
         $datatables_service = new DatatablesService();
-        $filesystem         = new Filesystem(new MemoryAdapter());
+        $filesystem         = new Filesystem(new NullAdapter());
         $controller         = new MediaController($datatables_service, $filesystem);
-        $request            = self::createRequest();
+        $request            = self::createRequest()->withAttribute('filesystem.data', $data_filesystem);
         $response           = $controller->uploadAction($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
diff --git a/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php b/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php
index fdc186cd2b..e0c33f7208 100644
--- a/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php
+++ b/tests/app/Http/Controllers/Admin/UpgradeControllerTest.php
@@ -30,8 +30,8 @@ use Fisharebest\Webtrees\Services\UpgradeService;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
+use League\Flysystem\Adapter\NullAdapter;
 use League\Flysystem\Filesystem;
-use League\Flysystem\Memory\MemoryAdapter;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
@@ -49,7 +49,6 @@ class UpgradeControllerTest extends TestCase
     public function testWizard(): void
     {
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             new UpgradeService(new TimeoutService())
         );
@@ -68,12 +67,13 @@ class UpgradeControllerTest extends TestCase
         $this->importTree('demo.ged');
 
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['continue' => '1']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_GET, ['continue' => '1'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->wizard($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -87,12 +87,13 @@ class UpgradeControllerTest extends TestCase
         $this->expectException(NotFoundHttpException::class);
 
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             new UpgradeService(new TimeoutService())
         );
 
-        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Invalid']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Invalid'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $controller->step($request);
     }
 
@@ -104,12 +105,13 @@ class UpgradeControllerTest extends TestCase
         $mock_upgrade_service = $this->createMock(UpgradeService::class);
         $mock_upgrade_service->method('latestVersion')->willReturn('999.999.999');
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Check']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Check'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -125,12 +127,13 @@ class UpgradeControllerTest extends TestCase
         $mock_upgrade_service = $this->createMock(UpgradeService::class);
         $mock_upgrade_service->method('latestVersion')->willReturn('');
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             $mock_upgrade_service
         );
 
-        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Check']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Check'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $controller->step($request);
     }
 
@@ -144,12 +147,13 @@ class UpgradeControllerTest extends TestCase
         $mock_upgrade_service = $this->createMock(UpgradeService::class);
         $mock_upgrade_service->method('latestVersion')->willReturn('0.0.0');
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             $mock_upgrade_service
         );
 
-        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Check']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Check'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $controller->step($request);
     }
 
@@ -159,12 +163,13 @@ class UpgradeControllerTest extends TestCase
     public function testStepPrepare(): void
     {
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Prepare']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Prepare'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -176,12 +181,13 @@ class UpgradeControllerTest extends TestCase
     public function testStepPending(): void
     {
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Pending']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Pending'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -202,12 +208,13 @@ class UpgradeControllerTest extends TestCase
         $tree->createIndividual("0 @@ INDI\n1 NAME Joe Bloggs");
 
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             new UpgradeService(new TimeoutService())
         );
 
-        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Pending']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Pending'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $controller->step($request);
     }
 
@@ -216,15 +223,20 @@ class UpgradeControllerTest extends TestCase
      */
     public function testStepExport(): void
     {
-        $tree       = $this->importTree('demo.ged');
+        $tree            = $this->importTree('demo.ged');
+        $all_trees       = Collection::make([$tree->name() => $tree]);
+        $tree_service    = $this->createMock(TreeService::class);
+        $tree_service->method('all')->willReturn($all_trees);
+
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
-            new TreeService(),
+            $tree_service,
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Export'])
-            ->withAttribute('tree', $tree);
+        $request  = self::createRequest()
+            ->withQueryParams(['step' => 'Export', 'tree' => $tree->name()])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -245,12 +257,13 @@ class UpgradeControllerTest extends TestCase
         $mock_upgrade_service = $this->createMock(UpgradeService::class);
         $mock_upgrade_service->method('downloadFile')->will($this->throwException(new Exception()));
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             $mock_upgrade_service
         );
 
-        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Download']);
+        $request = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Download'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $controller->step($request);
     }
 
@@ -262,12 +275,13 @@ class UpgradeControllerTest extends TestCase
         $mock_upgrade_service = $this->createMock(UpgradeService::class);
         $mock_upgrade_service->method('downloadFile')->willReturn(123456);
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Download']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Download'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -281,12 +295,13 @@ class UpgradeControllerTest extends TestCase
         $mock_upgrade_service = $this->createMock(UpgradeService::class);
         $mock_upgrade_service->method('webtreesZipContents')->willReturn(new Collection([]));
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Unzip']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Unzip'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -298,12 +313,13 @@ class UpgradeControllerTest extends TestCase
     public function testStepCopy(): void
     {
         $controller = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             new UpgradeService(new TimeoutService())
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Copy']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Copy'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
@@ -316,12 +332,13 @@ class UpgradeControllerTest extends TestCase
     {
         $mock_upgrade_service = $this->createMock(UpgradeService::class);
         $controller           = new UpgradeController(
-            new Filesystem(new MemoryAdapter()),
             new TreeService(),
             $mock_upgrade_service
         );
 
-        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Cleanup']);
+        $request  = self::createRequest(RequestMethodInterface::METHOD_POST, ['step' => 'Cleanup'])
+            ->withAttribute('filesystem.data', new Filesystem(new NullAdapter()))
+            ->withAttribute('filesystem.root', new Filesystem(new NullAdapter()));
         $response = $controller->step($request);
 
         $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
diff --git a/tests/app/Http/Middleware/DoHousekeepingTest.php b/tests/app/Http/Middleware/DoHousekeepingTest.php
index 8275adfbd5..d743249f26 100644
--- a/tests/app/Http/Middleware/DoHousekeepingTest.php
+++ b/tests/app/Http/Middleware/DoHousekeepingTest.php
@@ -22,6 +22,8 @@ namespace Fisharebest\Webtrees\Http\Middleware;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\HousekeepingService;
 use Fisharebest\Webtrees\TestCase;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 use Psr\Http\Server\RequestHandlerInterface;
 
 use function response;
@@ -38,10 +40,15 @@ class DoHousekeepingTest extends TestCase
      */
     public function testMiddleware(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+        $root_filesystem = new Filesystem(new NullAdapter());
+
         $handler = $this->createMock(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response());
 
-        $request    = self::createRequest();
+        $request    = self::createRequest()
+            ->withAttribute('filesystem.data', $data_filesystem)
+            ->withAttribute('filesystem.root', $root_filesystem);
         $middleware = new DoHousekeeping(new HousekeepingService());
         $response   = $middleware->process($request, $handler);
 
diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php
index dcbde60176..06cbdd0626 100644
--- a/tests/app/Module/AhnentafelReportModuleTest.php
+++ b/tests/app/Module/AhnentafelReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class AhnentafelReportModule
@@ -76,6 +78,8 @@ class AhnentafelReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -97,13 +101,13 @@ class AhnentafelReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/BirthDeathMarriageReportModuleTest.php b/tests/app/Module/BirthDeathMarriageReportModuleTest.php
index e40bb71f08..a10e846d91 100644
--- a/tests/app/Module/BirthDeathMarriageReportModuleTest.php
+++ b/tests/app/Module/BirthDeathMarriageReportModuleTest.php
@@ -25,6 +25,8 @@ use Fisharebest\Webtrees\Report\ReportParserSetup;
 use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class BirthDeathMarriageReportModule
@@ -74,6 +76,8 @@ class BirthDeathMarriageReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $tree = $this->importTree('demo.ged');
         $xml  = Webtrees::ROOT_DIR . 'resources/xml/reports/bdm_report.xml';
         $vars = [
@@ -91,13 +95,13 @@ class BirthDeathMarriageReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php
index c444848cb7..1c0502d7eb 100644
--- a/tests/app/Module/BirthReportModuleTest.php
+++ b/tests/app/Module/BirthReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class BirthReportModule
@@ -76,6 +78,8 @@ class BirthReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -95,13 +99,13 @@ class BirthReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php
index c43f81cf9f..f36ef0dc3f 100644
--- a/tests/app/Module/CemeteryReportModuleTest.php
+++ b/tests/app/Module/CemeteryReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class CemeteryReportModule
@@ -76,6 +78,8 @@ class CemeteryReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -93,13 +97,13 @@ class CemeteryReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php
index f354a11a20..af41948d8c 100644
--- a/tests/app/Module/ChangeReportModuleTest.php
+++ b/tests/app/Module/ChangeReportModuleTest.php
@@ -28,6 +28,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class ChangeReportModule
@@ -77,6 +79,8 @@ class ChangeReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -96,13 +100,13 @@ class ChangeReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php
index f223a3d3f1..a678212295 100644
--- a/tests/app/Module/DeathReportModuleTest.php
+++ b/tests/app/Module/DeathReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class FactSourcesReportModule
@@ -76,6 +78,8 @@ class DeathReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -96,13 +100,13 @@ class DeathReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php
index 49d8ea0245..bacfe8bab1 100644
--- a/tests/app/Module/DescendancyReportModuleTest.php
+++ b/tests/app/Module/DescendancyReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class DescendancyReportModule
@@ -76,6 +78,8 @@ class DescendancyReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -93,13 +97,13 @@ class DescendancyReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php
index 1318dbfe70..356c33cde9 100644
--- a/tests/app/Module/FactSourcesReportModuleTest.php
+++ b/tests/app/Module/FactSourcesReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class FactSourcesReportModule
@@ -76,6 +78,8 @@ class FactSourcesReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -93,13 +97,13 @@ class FactSourcesReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php
index c1786b4987..5f056b4470 100644
--- a/tests/app/Module/FamilyGroupReportModuleTest.php
+++ b/tests/app/Module/FamilyGroupReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class FamilyGroupReportModule
@@ -76,6 +78,8 @@ class FamilyGroupReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -96,13 +100,13 @@ class FamilyGroupReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php
index cefdbee406..829ed44f64 100644
--- a/tests/app/Module/IndividualFamiliesReportModuleTest.php
+++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class IndividualFamiliesReportModule
@@ -76,6 +78,8 @@ class IndividualFamiliesReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -98,13 +102,13 @@ class IndividualFamiliesReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php
index 1500b783c8..5e49d421ab 100644
--- a/tests/app/Module/IndividualReportModuleTest.php
+++ b/tests/app/Module/IndividualReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class IndividualReportModule
@@ -77,6 +79,8 @@ class IndividualReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -96,13 +100,13 @@ class IndividualReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php
index 15ed3303fc..8bd4772e4f 100644
--- a/tests/app/Module/MarriageReportModuleTest.php
+++ b/tests/app/Module/MarriageReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class MarriageReportModule
@@ -76,6 +78,8 @@ class MarriageReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -95,13 +99,13 @@ class MarriageReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php
index 27533a84a1..c7ae9171e7 100644
--- a/tests/app/Module/MissingFactsReportModuleTest.php
+++ b/tests/app/Module/MissingFactsReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class MissingFactsReportModule
@@ -76,6 +78,8 @@ class MissingFactsReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -107,13 +111,13 @@ class MissingFactsReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php
index b5e31c2887..705f124c6a 100644
--- a/tests/app/Module/OccupationReportModuleTest.php
+++ b/tests/app/Module/OccupationReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class OccupationReportModule
@@ -76,6 +78,8 @@ class OccupationReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -92,13 +96,13 @@ class OccupationReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php
index f8340c9aef..b0f9687263 100644
--- a/tests/app/Module/PedigreeReportModuleTest.php
+++ b/tests/app/Module/PedigreeReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class PedigreeReportModule
@@ -76,6 +78,8 @@ class PedigreeReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -92,13 +96,13 @@ class PedigreeReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);
diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php
index a27d64d728..b45754c5e6 100644
--- a/tests/app/Module/RelatedIndividualsReportModuleTest.php
+++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php
@@ -27,6 +27,8 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Webtrees;
+use League\Flysystem\Adapter\NullAdapter;
+use League\Flysystem\Filesystem;
 
 /**
  * Test harness for the class RelatedIndividualsReportModule
@@ -76,6 +78,8 @@ class RelatedIndividualsReportModuleTest extends TestCase
      */
     public function testReportRunsWithoutError(): void
     {
+        $data_filesystem = new Filesystem(new NullAdapter());
+
         $user = (new UserService())->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference('canadmin', '1');
         Auth::login($user);
@@ -98,13 +102,13 @@ class RelatedIndividualsReportModuleTest extends TestCase
         $this->assertIsArray($report->reportProperties());
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportHtml(), $vars, $tree, $data_filesystem);
         $html = ob_get_clean();
         $this->assertStringStartsWith('<', $html);
         $this->assertStringEndsWith('>', $html);
 
         ob_start();
-        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree);
+        new ReportParserGenerate($xml, new ReportPdf(), $vars, $tree, $data_filesystem);
         $pdf = ob_get_clean();
         $this->assertStringStartsWith('%PDF', $pdf);
         $this->assertStringEndsWith("%%EOF\n", $pdf);