Move FunctionsImport to GedcomImportService

16 files changed, 172 insertions, 131 deletions

diff --git a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php
index c151cf586c..201adffd80 100644
--- a/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php
+++ b/tests/app/Http/RequestHandlers/ControlPanelControllerTest.php
@@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Http\Controllers\Admin;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel;
 use Fisharebest\Webtrees\Services\AdminService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\HousekeepingService;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\ServerCheckService;
@@ -45,17 +46,18 @@ class ControlPanelControllerTest extends TestCase
      */
     public function testControlPanel(): void
     {
-        $admin_service        = new AdminService();
-        $module_service       = new ModuleService();
-        $housekeeping_service = new HousekeepingService();
-        $server_check_service = new ServerCheckService();
-        $timeout_service      = new TimeoutService();
-        $tree_service         = new TreeService();
-        $upgrade_service      = new UpgradeService($timeout_service);
-        $user_service         = new UserService();
-        $handler              = new ControlPanel($admin_service, $housekeeping_service, $module_service, $server_check_service, $tree_service, $upgrade_service, $user_service);
-        $request              = self::createRequest();
-        $response             = $handler->handle($request);
+        $admin_service         = new AdminService();
+        $module_service        = new ModuleService();
+        $housekeeping_service  = new HousekeepingService();
+        $server_check_service  = new ServerCheckService();
+        $timeout_service       = new TimeoutService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $upgrade_service       = new UpgradeService($timeout_service);
+        $user_service          = new UserService();
+        $handler               = new ControlPanel($admin_service, $housekeeping_service, $module_service, $server_check_service, $tree_service, $upgrade_service, $user_service);
+        $request               = self::createRequest();
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
diff --git a/tests/app/Http/RequestHandlers/DataFixDataTest.php b/tests/app/Http/RequestHandlers/DataFixDataTest.php
index af24f8694c..d771c4ba92 100644
--- a/tests/app/Http/RequestHandlers/DataFixDataTest.php
+++ b/tests/app/Http/RequestHandlers/DataFixDataTest.php
@@ -22,11 +22,12 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Services\DataFixService;
 use Fisharebest\Webtrees\Services\DatatablesService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
+use Fisharebest\Webtrees\TestCase;
 
 /**
  * Test DataFixDataTest class.
@@ -43,8 +44,9 @@ class DataFixDataTest extends TestCase
      */
     public function testHandlerForFixSearchAndReplace(): void
     {
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
 
         $data_fix_service = new DataFixService();
         $datatables_service = new DatatablesService();
diff --git a/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php b/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php
index 6ea1e73d1c..e753f60cc2 100644
--- a/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php
+++ b/tests/app/Http/RequestHandlers/FixLevel0MediaActionTest.php
@@ -21,6 +21,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
 
@@ -38,16 +39,17 @@ class FixLevel0MediaActionTest extends TestCase
      */
     public function testFixLevel0MediaAction(): void
     {
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $handler      = new FixLevel0MediaAction($tree_service);
-        $request      = self::createRequest(RequestMethodInterface::METHOD_POST, [], [
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $handler               = new FixLevel0MediaAction($tree_service);
+        $request               = self::createRequest(RequestMethodInterface::METHOD_POST, [], [
             'tree_id'   => $tree->id(),
             'fact_id'   => '',
             'indi_xref' => '',
             'obje_xref' => '',
         ]);
-        $response     = $handler->handle($request);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_NO_CONTENT, $response->getStatusCode());
     }
diff --git a/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php b/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php
index ac2047c7bd..ec9cad4644 100644
--- a/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php
+++ b/tests/app/Http/RequestHandlers/FixLevel0MediaDataTest.php
@@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\DatatablesService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
 
@@ -39,12 +40,13 @@ class FixLevel0MediaDataTest extends TestCase
      */
     public function testFixLevel0MediaData(): void
     {
-        $datatables_service = new DatatablesService();
-        $tree_service       = new TreeService();
-        $tree               = $tree_service->create('name', 'title');
-        $handler            = new FixLevel0MediaData($datatables_service, $tree_service);
-        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, ['tree_id' => $tree->id()]);
-        $response           = $handler->handle($request);
+        $datatables_service    = new DatatablesService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $handler               = new FixLevel0MediaData($datatables_service, $tree_service);
+        $request               = self::createRequest(RequestMethodInterface::METHOD_GET, ['tree_id' => $tree->id()]);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
diff --git a/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php b/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php
index 05058e594b..4b431346b7 100644
--- a/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php
+++ b/tests/app/Http/RequestHandlers/ImportThumbnailsActionTest.php
@@ -20,6 +20,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\PendingChangesService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
@@ -38,8 +39,9 @@ class ImportThumbnailsActionTest extends TestCase
      */
     public function testWebtrees1ThumbnailsAction(): void
     {
-        $tree_service            = new TreeService();
-        $pending_changes_service = new PendingChangesService();
+        $gedcom_import_service   = new GedcomImportService();
+        $tree_service            = new TreeService($gedcom_import_service);
+        $pending_changes_service = new PendingChangesService($gedcom_import_service);
         $handler                 = new ImportThumbnailsAction($pending_changes_service, $tree_service);
         $request                 = self::createRequest()
             ->withParsedBody(['thumbnail' => 'foo', 'action' => '', 'xref' => [], 'ged' => []]);
diff --git a/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php b/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php
index 85fbdef89d..eeecec7346 100644
--- a/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php
+++ b/tests/app/Http/RequestHandlers/ImportThumbnailsDataTest.php
@@ -20,6 +20,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\SearchService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
@@ -38,11 +39,12 @@ class ImportThumbnailsDataTest extends TestCase
      */
     public function testWebtrees1ThumbnailsData(): void
     {
-        $tree_service   = new TreeService();
-        $search_service = new SearchService($tree_service);
-        $handler        = new ImportThumbnailsData($search_service);
-        $request        = self::createRequest()->withQueryParams(['start' => '0', 'length' => '10', 'search' => ['value' => ''], 'draw' => '1']);
-        $response       = $handler->handle($request);
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $search_service        = new SearchService($tree_service);
+        $handler               = new ImportThumbnailsData($search_service);
+        $request               = self::createRequest()->withQueryParams(['start' => '0', 'length' => '10', 'search' => ['value' => ''], 'draw' => '1']);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
diff --git a/tests/app/Http/RequestHandlers/LoginPageTest.php b/tests/app/Http/RequestHandlers/LoginPageTest.php
index e1c5d270cb..383f4c1e3a 100644
--- a/tests/app/Http/RequestHandlers/LoginPageTest.php
+++ b/tests/app/Http/RequestHandlers/LoginPageTest.php
@@ -20,6 +20,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\User;
@@ -34,10 +35,11 @@ class LoginPageTest extends TestCase
      */
     public function testLoginPage(): void
     {
-        $tree_service = new TreeService();
-        $request  = self::createRequest();
-        $handler  = new LoginPage($tree_service);
-        $response = $handler->handle($request);
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $request               = self::createRequest();
+        $handler               = new LoginPage($tree_service);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
@@ -47,11 +49,12 @@ class LoginPageTest extends TestCase
      */
     public function testLoginPageAlreadyLoggedIn(): void
     {
-        $tree_service = new TreeService();
-        $user     = $this->createMock(User::class);
-        $request  = self::createRequest()->withAttribute('user', $user);
-        $handler  = new LoginPage($tree_service);
-        $response = $handler->handle($request);
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $user                  = $this->createMock(User::class);
+        $request               = self::createRequest()->withAttribute('user', $user);
+        $handler               = new LoginPage($tree_service);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_FOUND, $response->getStatusCode());
     }
diff --git a/tests/app/Http/RequestHandlers/ManageMediaDataTest.php b/tests/app/Http/RequestHandlers/ManageMediaDataTest.php
index 3e9634b1c4..cc304777d5 100644
--- a/tests/app/Http/RequestHandlers/ManageMediaDataTest.php
+++ b/tests/app/Http/RequestHandlers/ManageMediaDataTest.php
@@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\DatatablesService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\MediaFileService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\TestCase;
@@ -40,11 +41,12 @@ class ManageMediaDataTest extends TestCase
      */
     public function testDataLocal(): void
     {
-        $datatables_service = new DatatablesService();
-        $media_file_service = new MediaFileService();
-        $tree_service       = new TreeService();
-        $handler            = new ManageMediaData($datatables_service, $media_file_service, $tree_service);
-        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
+        $datatables_service    = new DatatablesService();
+        $media_file_service    = new MediaFileService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $handler               = new ManageMediaData($datatables_service, $media_file_service, $tree_service);
+        $request               = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'files'        => 'local',
             'media_folder' => '',
             'subfolders'   => 'include',
@@ -52,7 +54,7 @@ class ManageMediaDataTest extends TestCase
             'start'        => '0',
             'length'       => '10',
         ]);
-        $response           = $handler->handle($request);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
@@ -62,11 +64,12 @@ class ManageMediaDataTest extends TestCase
      */
     public function testDataExternal(): void
     {
-        $datatables_service = new DatatablesService();
-        $media_file_service = new MediaFileService();
-        $tree_service       = new TreeService();
-        $handler            = new ManageMediaData($datatables_service, $media_file_service, $tree_service);
-        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
+        $datatables_service    = new DatatablesService();
+        $media_file_service    = new MediaFileService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $handler               = new ManageMediaData($datatables_service, $media_file_service, $tree_service);
+        $request               = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'files'        => 'local',
             'media_folder' => '',
             'subfolders'   => 'include',
@@ -74,7 +77,7 @@ class ManageMediaDataTest extends TestCase
             'start'        => '0',
             'length'       => '10',
         ]);
-        $response           = $handler->handle($request);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
@@ -84,11 +87,12 @@ class ManageMediaDataTest extends TestCase
      */
     public function testDataUnused(): void
     {
-        $datatables_service = new DatatablesService();
-        $media_file_service = new MediaFileService();
-        $tree_service       = new TreeService();
-        $handler            = new ManageMediaData($datatables_service, $media_file_service, $tree_service);
-        $request            = self::createRequest(RequestMethodInterface::METHOD_GET, [
+        $datatables_service    = new DatatablesService();
+        $media_file_service    = new MediaFileService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $handler               = new ManageMediaData($datatables_service, $media_file_service, $tree_service);
+        $request               = self::createRequest(RequestMethodInterface::METHOD_GET, [
             'files'        => 'local',
             'media_folder' => '',
             'subfolders'   => 'include',
@@ -96,7 +100,7 @@ class ManageMediaDataTest extends TestCase
             'start'        => '0',
             'length'       => '10',
         ]);
-        $response           = $handler->handle($request);
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
diff --git a/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php b/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php
index 6b365c0f42..695c601611 100644
--- a/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php
+++ b/tests/app/Http/RequestHandlers/UpgradeWizardPageTest.php
@@ -20,6 +20,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TimeoutService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\Services\UpgradeService;
@@ -39,12 +40,13 @@ class UpgradeWizardPageTest extends TestCase
      */
     public function testWizard(): void
     {
-        $timeout_service = new TimeoutService();
-        $tree_service    = new TreeService();
-        $upgrade_service = new UpgradeService($timeout_service);
-        $handler         = new UpgradeWizardPage($tree_service, $upgrade_service);
-        $request         = self::createRequest();
-        $response        = $handler->handle($request);
+        $timeout_service       = new TimeoutService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $upgrade_service       = new UpgradeService($timeout_service);
+        $handler               = new UpgradeWizardPage($tree_service, $upgrade_service);
+        $request               = self::createRequest();
+        $response              = $handler->handle($request);
 
         self::assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode());
     }
diff --git a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php
index e3d9e6374e..4cc64fb886 100644
--- a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php
+++ b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php
@@ -25,6 +25,7 @@ use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\Http\Exceptions\HttpServerErrorException;
 use Fisharebest\Webtrees\Services\GedcomExportService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TimeoutService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\Services\UpgradeService;
@@ -48,7 +49,7 @@ class UpgradeWizardStepTest extends TestCase
     {
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             new UpgradeService(new TimeoutService())
         );
 
@@ -68,7 +69,7 @@ class UpgradeWizardStepTest extends TestCase
         $mock_upgrade_service->method('latestVersion')->willReturn('999.999.999');
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             $mock_upgrade_service
         );
 
@@ -89,7 +90,7 @@ class UpgradeWizardStepTest extends TestCase
         $mock_upgrade_service->method('latestVersion')->willReturn('');
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             $mock_upgrade_service
         );
 
@@ -108,7 +109,7 @@ class UpgradeWizardStepTest extends TestCase
         $mock_upgrade_service->method('latestVersion')->willReturn('0.0.0');
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             $mock_upgrade_service
         );
 
@@ -123,7 +124,7 @@ class UpgradeWizardStepTest extends TestCase
     {
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             new UpgradeService(new TimeoutService())
         );
 
@@ -140,7 +141,7 @@ class UpgradeWizardStepTest extends TestCase
     {
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             new UpgradeService(new TimeoutService())
         );
 
@@ -155,7 +156,7 @@ class UpgradeWizardStepTest extends TestCase
      */
     public function testStepPendingExist(): void
     {
-        $tree_service = new TreeService();
+        $tree_service = new TreeService(new GedcomImportService());
         $tree         = $tree_service->create('name', 'title');
         $user         = (new UserService())->create('user', 'name', 'email', 'password');
 
@@ -164,7 +165,7 @@ class UpgradeWizardStepTest extends TestCase
 
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             new UpgradeService(new TimeoutService())
         );
 
@@ -212,7 +213,7 @@ class UpgradeWizardStepTest extends TestCase
         $mock_upgrade_service->method('downloadFile')->will(self::throwException(new Exception()));
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             $mock_upgrade_service
         );
 
@@ -229,7 +230,7 @@ class UpgradeWizardStepTest extends TestCase
         $mock_upgrade_service->method('downloadFile')->willReturn(123456);
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             $mock_upgrade_service
         );
 
@@ -248,7 +249,7 @@ class UpgradeWizardStepTest extends TestCase
         $mock_upgrade_service->method('webtreesZipContents')->willReturn(new Collection());
         $handler = new UpgradeWizardStep(
             new GedcomExportService(),
-            new TreeService(),
+            new TreeService(new GedcomImportService()),
             $mock_upgrade_service
         );
 
diff --git a/tests/app/Http/RequestHandlers/UserEditActionTest.php b/tests/app/Http/RequestHandlers/UserEditActionTest.php
index 863cc25961..1b6f5b8695 100644
--- a/tests/app/Http/RequestHandlers/UserEditActionTest.php
+++ b/tests/app/Http/RequestHandlers/UserEditActionTest.php
@@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\EmailService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\Services\UserService;
 use Fisharebest\Webtrees\TestCase;
@@ -41,7 +42,7 @@ class UserEditActionTest extends TestCase
     public function testHandler(): void
     {
         $mail_service = new EmailService();
-        $tree_service = new TreeService();
+        $tree_service = new TreeService(new GedcomImportService());
         $user_service = new UserService();
         $user         = $user_service->create('user', 'real', 'email', 'pass');
         $handler      = new UserEditAction($mail_service, $tree_service, $user_service);
diff --git a/tests/app/Http/RequestHandlers/UserEditPageTest.php b/tests/app/Http/RequestHandlers/UserEditPageTest.php
index 8e543e5655..eafd57a7f3 100644
--- a/tests/app/Http/RequestHandlers/UserEditPageTest.php
+++ b/tests/app/Http/RequestHandlers/UserEditPageTest.php
@@ -22,6 +22,7 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers;
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Services\EmailService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\MessageService;
 use Fisharebest\Webtrees\Services\ModuleService;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -44,7 +45,7 @@ class UserEditPageTest extends TestCase
     {
         $mail_service    = new EmailService();
         $module_service  = new ModuleService();
-        $tree_service    = new TreeService();
+        $tree_service    = new TreeService(new GedcomImportService());
         $user_service    = new UserService();
         $message_service = new MessageService($mail_service, $user_service);
         $user            = $user_service->create('user', 'real', 'email', 'pass');
diff --git a/tests/app/Module/FixDuplicateLinksTest.php b/tests/app/Module/FixDuplicateLinksTest.php
index e5ff250232..cefed6ca58 100644
--- a/tests/app/Module/FixDuplicateLinksTest.php
+++ b/tests/app/Module/FixDuplicateLinksTest.php
@@ -20,6 +20,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Session;
 use Fisharebest\Webtrees\TestCase;
 use Fisharebest\Webtrees\Tree;
@@ -50,7 +51,7 @@ class FixDuplicateLinksTest extends TestCase
     {
         parent::setUp();
 
-        $tree_service = new TreeService();
+        $tree_service = new TreeService(new GedcomImportService());
         $this->tree = $tree_service->create('name', 'title');
 
         $this->fixDuplicateLinks = new FixDuplicateLinks(new DataFixService());
diff --git a/tests/app/Services/SearchServiceTest.php b/tests/app/Services/SearchServiceTest.php
index fa38af74bf..8886aacb94 100644
--- a/tests/app/Services/SearchServiceTest.php
+++ b/tests/app/Services/SearchServiceTest.php
@@ -36,7 +36,7 @@ class SearchServiceTest extends TestCase
      */
     public function testSearchesReturnCollections(): void
     {
-        $tree_service = new TreeService();
+        $tree_service = new TreeService(new GedcomImportService());
         $search_service = new SearchService($tree_service);
         $tree = $this->importTree('demo.ged');
 
diff --git a/tests/app/TreeTest.php b/tests/app/TreeTest.php
index a49f28f2d8..5e8b97d539 100644
--- a/tests/app/TreeTest.php
+++ b/tests/app/TreeTest.php
@@ -21,8 +21,8 @@ namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Contracts\CacheFactoryInterface;
 use Fisharebest\Webtrees\Contracts\UserInterface;
-use Fisharebest\Webtrees\Functions\FunctionsImport;
 use Fisharebest\Webtrees\Services\GedcomExportService;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Fisharebest\Webtrees\Services\UserService;
 use InvalidArgumentException;
@@ -58,8 +58,9 @@ class TreeTest extends TestCase
      */
     public function testConstructor(): void
     {
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
 
         self::assertSame('name', $tree->name());
         self::assertSame('title', $tree->title());
@@ -72,8 +73,9 @@ class TreeTest extends TestCase
      */
     public function testTreePreferences(): void
     {
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
 
         $tree->setPreference('foo', 'bar');
         $pref = $tree->getPreference('foo');
@@ -87,10 +89,11 @@ class TreeTest extends TestCase
      */
     public function testUserTreePreferences(): void
     {
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
 
         $pref = $tree->getUserPreference($user, 'foo', 'default');
         self::assertSame('default', $pref);
@@ -108,10 +111,11 @@ class TreeTest extends TestCase
     {
         $this->expectException(InvalidArgumentException::class);
 
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -124,10 +128,11 @@ class TreeTest extends TestCase
      */
     public function testCreateIndividual(): void
     {
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -147,10 +152,11 @@ class TreeTest extends TestCase
     {
         $this->expectException(InvalidArgumentException::class);
 
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -163,10 +169,11 @@ class TreeTest extends TestCase
      */
     public function testCreateFamily(): void
     {
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -186,10 +193,11 @@ class TreeTest extends TestCase
     {
         $this->expectException(InvalidArgumentException::class);
 
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -202,10 +210,11 @@ class TreeTest extends TestCase
      */
     public function testCreateMediaObject(): void
     {
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -225,10 +234,11 @@ class TreeTest extends TestCase
     {
         $this->expectException(InvalidArgumentException::class);
 
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -241,10 +251,11 @@ class TreeTest extends TestCase
      */
     public function testCreateRecord(): void
     {
-        $user_service = new UserService();
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
+        $user_service          = new UserService();
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_IS_ADMINISTRATOR, '1');
         Auth::login($user);
 
@@ -262,15 +273,16 @@ class TreeTest extends TestCase
      */
     public function testSignificantIndividual(): void
     {
+        $gedcom_import_service = new GedcomImportService();
         $user_service = new UserService();
-        $tree_service = new TreeService();
+        $tree_service = new TreeService($gedcom_import_service);
         $tree         = $tree_service->create('name', 'title');
         $user         = $user_service->create('user', 'User', 'user@example.com', 'secret');
         $user->setPreference(UserInterface::PREF_AUTO_ACCEPT_EDITS, '1');
         Auth::login($user);
 
         // Delete the tree's default individual.
-        FunctionsImport::updateRecord('0 @X1@ INDI', $tree, true);
+        $gedcom_import_service->updateRecord('0 @X1@ INDI', $tree, true);
 
         // No individuals in tree?  Fake individual
         self::assertSame('I', $tree->significantIndividual($user)->xref());
@@ -303,8 +315,9 @@ class TreeTest extends TestCase
      */
     public function testImportAndDeleteGedcomFile(): void
     {
-        $tree_service = new TreeService();
-        $tree = $this->importTree('demo.ged');
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $this->importTree('demo.ged');
         self::assertNotNull($tree_service->all()->get('demo.ged'));
         Site::setPreference('DEFAULT_GEDCOM', $tree->name());
 
diff --git a/tests/app/TreeUserTest.php b/tests/app/TreeUserTest.php
index cd6edbcee3..9ed9b3b6a6 100644
--- a/tests/app/TreeUserTest.php
+++ b/tests/app/TreeUserTest.php
@@ -20,6 +20,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Contracts\UserInterface;
+use Fisharebest\Webtrees\Services\GedcomImportService;
 use Fisharebest\Webtrees\Services\TreeService;
 
 /**
@@ -39,9 +40,10 @@ class TreeUserTest extends TestCase
      */
     public function testConstructor(): void
     {
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = new TreeUser($tree);
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = new TreeUser($tree);
 
         self::assertInstanceOf(UserInterface::class, $user);
         self::assertSame(0, $user->id());
@@ -57,9 +59,10 @@ class TreeUserTest extends TestCase
      */
     public function testPreferences(): void
     {
-        $tree_service = new TreeService();
-        $tree         = $tree_service->create('name', 'title');
-        $user         = new TreeUser($tree);
+        $gedcom_import_service = new GedcomImportService();
+        $tree_service          = new TreeService($gedcom_import_service);
+        $tree                  = $tree_service->create('name', 'title');
+        $user                  = new TreeUser($tree);
 
         self::assertSame('', $user->getPreference('foo'));
         self::assertSame('', $user->getPreference('foo'));