PHPunit: mock objects have expectations, stubs do not

44 files changed, 159 insertions, 159 deletions

diff --git a/tests/app/Http/RequestHandlers/AccountDeleteTest.php b/tests/app/Http/RequestHandlers/AccountDeleteTest.php
index 8cc0e00d9d..8e4723aa24 100644
--- a/tests/app/Http/RequestHandlers/AccountDeleteTest.php
+++ b/tests/app/Http/RequestHandlers/AccountDeleteTest.php
@@ -29,7 +29,7 @@ class AccountDeleteTest extends TestCase
 {
     public function testHandler(): void
     {
-        $user_service = $this->createMock(UserService::class);
+        $user_service = $this->createStub(UserService::class);
 
         $request = self::createRequest();
 
diff --git a/tests/app/Http/RequestHandlers/AccountEditTest.php b/tests/app/Http/RequestHandlers/AccountEditTest.php
index b4942e0913..07f0e397f2 100644
--- a/tests/app/Http/RequestHandlers/AccountEditTest.php
+++ b/tests/app/Http/RequestHandlers/AccountEditTest.php
@@ -34,9 +34,9 @@ class AccountEditTest extends TestCase
 
     public function testHandler(): void
     {
-        $user            = $this->createMock(User::class);
-        $message_service = $this->createMock(MessageService::class);
-        $module_service  = $this->createMock(ModuleService::class);
+        $user            = $this->createStub(User::class);
+        $message_service = $this->createStub(MessageService::class);
+        $module_service  = $this->createStub(ModuleService::class);
 
         $module_service->method('findByInterface')->willReturn(new Collection([]));
 
diff --git a/tests/app/Http/RequestHandlers/AccountUpdateTest.php b/tests/app/Http/RequestHandlers/AccountUpdateTest.php
index 5992522e09..4881992057 100644
--- a/tests/app/Http/RequestHandlers/AccountUpdateTest.php
+++ b/tests/app/Http/RequestHandlers/AccountUpdateTest.php
@@ -32,7 +32,7 @@ class AccountUpdateTest extends TestCase
 {
     public function testHandler(): void
     {
-        $user_service = $this->createMock(UserService::class);
+        $user_service = $this->createStub(UserService::class);
 
         $user = $this->createMock(User::class);
         $user->expects($this->once())->method('setEmail')->with('b');
diff --git a/tests/app/Http/RequestHandlers/BroadcastPageTest.php b/tests/app/Http/RequestHandlers/BroadcastPageTest.php
index ad4c5b29bb..53185153da 100644
--- a/tests/app/Http/RequestHandlers/BroadcastPageTest.php
+++ b/tests/app/Http/RequestHandlers/BroadcastPageTest.php
@@ -33,7 +33,7 @@ class BroadcastPageTest extends TestCase
 
     public function testMissingParameterTo(): void
     {
-        $message_service = $this->createMock(MessageService::class);
+        $message_service = $this->createStub(MessageService::class);
         $message_service->method('recipientTypes')->willReturn(['foo' => 'FOO']);
 
         $request = self::createRequest()
@@ -47,7 +47,7 @@ class BroadcastPageTest extends TestCase
     }
     public function testHandler(): void
     {
-        $message_service = $this->createMock(MessageService::class);
+        $message_service = $this->createStub(MessageService::class);
         $message_service->method('recipientTypes')->willReturn(['foo' => 'FOO', 'bar' => 'BAR']);
         $message_service->method('recipientUsers')->willReturn(new Collection());
 
diff --git a/tests/app/Http/RequestHandlers/DeleteUserTest.php b/tests/app/Http/RequestHandlers/DeleteUserTest.php
index d1e3b077e9..c891a2a4dc 100644
--- a/tests/app/Http/RequestHandlers/DeleteUserTest.php
+++ b/tests/app/Http/RequestHandlers/DeleteUserTest.php
@@ -35,7 +35,7 @@ class DeleteUserTest extends TestCase
 
     public function testDeleteUser(): void
     {
-        $user = $this->createMock(User::class);
+        $user = $this->createStub(User::class);
         $user->method('id')->willReturn(1);
 
         $user_service = $this->createMock(UserService::class);
diff --git a/tests/app/Http/RequestHandlers/LoginPageTest.php b/tests/app/Http/RequestHandlers/LoginPageTest.php
index a119a61027..c1c06a8533 100644
--- a/tests/app/Http/RequestHandlers/LoginPageTest.php
+++ b/tests/app/Http/RequestHandlers/LoginPageTest.php
@@ -46,7 +46,7 @@ class LoginPageTest extends TestCase
     {
         $gedcom_import_service = new GedcomImportService();
         $tree_service          = new TreeService($gedcom_import_service);
-        $user                  = $this->createMock(User::class);
+        $user                  = $this->createStub(User::class);
         $request               = self::createRequest()->withAttribute('user', $user);
         $handler               = new LoginPage($tree_service);
         $response              = $handler->handle($request);
diff --git a/tests/app/Http/RequestHandlers/ManageMediaDataTest.php b/tests/app/Http/RequestHandlers/ManageMediaDataTest.php
index 8fe03c4230..e64e09ee8d 100644
--- a/tests/app/Http/RequestHandlers/ManageMediaDataTest.php
+++ b/tests/app/Http/RequestHandlers/ManageMediaDataTest.php
@@ -40,7 +40,7 @@ class ManageMediaDataTest extends TestCase
         $datatables_service    = new DatatablesService();
         $gedcom_import_service = new GedcomImportService();
         $linked_record_service = new LinkedRecordService();
-        $media_file_service    = $this->createMock(MediaFileService::class);
+        $media_file_service    = $this->createStub(MediaFileService::class);
         $media_file_service->method('allMediaFolders')->willReturn(new Collection(['media/']));
         $tree_service          = new TreeService($gedcom_import_service);
         $handler               = new ManageMediaData($datatables_service, $linked_record_service, $media_file_service, $tree_service);
@@ -62,7 +62,7 @@ class ManageMediaDataTest extends TestCase
         $datatables_service    = new DatatablesService();
         $gedcom_import_service = new GedcomImportService();
         $linked_record_service = new LinkedRecordService();
-        $media_file_service    = $this->createMock(MediaFileService::class);
+        $media_file_service    = $this->createStub(MediaFileService::class);
         $media_file_service->method('allMediaFolders')->willReturn(new Collection(['media/']));
         $tree_service          = new TreeService($gedcom_import_service);
         $handler               = new ManageMediaData($datatables_service, $linked_record_service, $media_file_service, $tree_service);
@@ -84,7 +84,7 @@ class ManageMediaDataTest extends TestCase
         $datatables_service    = new DatatablesService();
         $gedcom_import_service = new GedcomImportService();
         $linked_record_service = new LinkedRecordService();
-        $media_file_service    = $this->createMock(MediaFileService::class);
+        $media_file_service    = $this->createStub(MediaFileService::class);
         $media_file_service->method('allMediaFolders')->willReturn(new Collection(['media/']));
         $tree_service          = new TreeService($gedcom_import_service);
         $handler               = new ManageMediaData($datatables_service, $linked_record_service, $media_file_service, $tree_service);
diff --git a/tests/app/Http/RequestHandlers/MasqueradeTest.php b/tests/app/Http/RequestHandlers/MasqueradeTest.php
index 9d7b72e37b..add27f3919 100644
--- a/tests/app/Http/RequestHandlers/MasqueradeTest.php
+++ b/tests/app/Http/RequestHandlers/MasqueradeTest.php
@@ -35,10 +35,10 @@ class MasqueradeTest extends TestCase
 
     public function testMasqueradeAsUser(): void
     {
-        $user1 = $this->createMock(User::class);
+        $user1 = $this->createStub(User::class);
         $user1->method('id')->willReturn(1);
 
-        $user2 = $this->createMock(User::class);
+        $user2 = $this->createStub(User::class);
         $user2->method('id')->willReturn(2);
 
         $user_service = $this->createMock(UserService::class);
@@ -58,7 +58,7 @@ class MasqueradeTest extends TestCase
 
     public function testCannotMasqueradeAsSelf(): void
     {
-        $user = $this->createMock(User::class);
+        $user = $this->createStub(User::class);
         $user->method('id')->willReturn(1);
 
         $user_service = $this->createMock(UserService::class);
@@ -80,7 +80,7 @@ class MasqueradeTest extends TestCase
         $this->expectException(HttpNotFoundException::class);
         $this->expectExceptionMessage('User ID 2 not found');
 
-        $user = $this->createMock(User::class);
+        $user = $this->createStub(User::class);
         $user->method('id')->willReturn(1);
 
         $user_service = $this->createMock(UserService::class);
diff --git a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php
index 15c30b6610..91b0b20ddc 100644
--- a/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php
+++ b/tests/app/Http/RequestHandlers/PasswordRequestPageTest.php
@@ -40,7 +40,7 @@ class PasswordRequestPageTest extends TestCase
 
     public function testPasswordRequestPageAlreadyLoggedIn(): void
     {
-        $user     = $this->createMock(User::class);
+        $user     = $this->createStub(User::class);
         $request  = self::createRequest()->withAttribute('user', $user);
         $handler  = new PasswordRequestPage();
         $response = $handler->handle($request);
diff --git a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
index 2536f1cb0e..13882cb6af 100644
--- a/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
+++ b/tests/app/Http/RequestHandlers/PasswordResetPageTest.php
@@ -33,7 +33,7 @@ class PasswordResetPageTest extends TestCase
 
     public function testPasswordResetPageWithValidToken(): void
     {
-        $user = $this->createMock(User::class);
+        $user = $this->createStub(User::class);
 
         $user_service = $this->createMock(UserService::class);
         $user_service
diff --git a/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php b/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php
index 5aa04326a7..44ad244010 100644
--- a/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectAncestryPhpTest.php
@@ -41,7 +41,7 @@ class RedirectAncestryPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -52,7 +52,7 @@ class RedirectAncestryPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -88,7 +88,7 @@ class RedirectAncestryPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -122,7 +122,7 @@ class RedirectAncestryPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection([]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $handler = new RedirectAncestryPhp($module_service, $tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php b/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
index 65fd8b1032..50fac52563 100644
--- a/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
@@ -38,7 +38,7 @@ class RedirectBranchesPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -83,7 +83,7 @@ class RedirectBranchesPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -91,7 +91,7 @@ class RedirectBranchesPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class)
@@ -117,7 +117,7 @@ class RedirectBranchesPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection([]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $handler = new RedirectBranchesPhp($module_service, $tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php b/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php
index 43a96f2674..62232b4fc3 100644
--- a/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectCalendarPhpTest.php
@@ -35,7 +35,7 @@ class RedirectCalendarPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
diff --git a/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php b/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php
index 2f01c3a51f..289948931b 100644
--- a/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectCompactPhpTest.php
@@ -41,7 +41,7 @@ class RedirectCompactPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -52,7 +52,7 @@ class RedirectCompactPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -94,7 +94,7 @@ class RedirectCompactPhpTest extends TestCase
             ->with(ModuleChartInterface::class)
             ->willReturn(new Collection());
 
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -119,7 +119,7 @@ class RedirectCompactPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection([]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $handler = new RedirectCompactPhp($module_service, $tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php b/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
index 7a2090fd70..dd002d8996 100644
--- a/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
@@ -41,7 +41,7 @@ class RedirectDescendancyPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -52,7 +52,7 @@ class RedirectDescendancyPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -87,13 +87,13 @@ class RedirectDescendancyPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class)
             ->willReturn(new Collection());
 
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -112,7 +112,7 @@ class RedirectDescendancyPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php
index dfca51fac2..6ad4ce47c1 100644
--- a/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFamListPhpTest.php
@@ -39,7 +39,7 @@ class RedirectFamListPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectFamListPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -103,7 +103,7 @@ class RedirectFamListPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
index 9adb2f090b..b6b251a01f 100644
--- a/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
@@ -41,7 +41,7 @@ class RedirectFamilyBookPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -52,7 +52,7 @@ class RedirectFamilyBookPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -87,13 +87,13 @@ class RedirectFamilyBookPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class)
             ->willReturn(new Collection());
 
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -112,7 +112,7 @@ class RedirectFamilyBookPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php
index fd0ba4739d..ff7f6ba661 100644
--- a/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFamilyPhpTest.php
@@ -39,7 +39,7 @@ class RedirectFamilyPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -50,7 +50,7 @@ class RedirectFamilyPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $family = $this->createMock(Family::class);
+        $family = $this->createStub(Family::class);
         $family
             ->method('url')
             ->willReturn('https://www.example.com');
@@ -76,7 +76,7 @@ class RedirectFamilyPhpTest extends TestCase
 
     public function testNoSuchRecord(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -95,7 +95,7 @@ class RedirectFamilyPhpTest extends TestCase
 
     public function testMissingXrefParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectFamilyPhp($tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php
index d5bcc3d8e4..c1c659305b 100644
--- a/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFanChartPhpTest.php
@@ -41,7 +41,7 @@ class RedirectFanChartPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -52,7 +52,7 @@ class RedirectFanChartPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -88,7 +88,7 @@ class RedirectFanChartPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -122,7 +122,7 @@ class RedirectFanChartPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection([]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $handler = new RedirectFanChartPhp($module_service, $tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php b/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php
index a2e49bb323..cec768bdc3 100644
--- a/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectGedRecordPhpTest.php
@@ -39,7 +39,7 @@ class RedirectGedRecordPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -50,7 +50,7 @@ class RedirectGedRecordPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $gedcom_record = $this->createMock(GedcomRecord::class);
+        $gedcom_record = $this->createStub(GedcomRecord::class);
         $gedcom_record
             ->method('url')
             ->willReturn('https://www.example.com');
@@ -79,7 +79,7 @@ class RedirectGedRecordPhpTest extends TestCase
 
     public function testNoSuchRecord(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -101,7 +101,7 @@ class RedirectGedRecordPhpTest extends TestCase
 
     public function testMissingXrefParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectGedRecordPhp($tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php b/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php
index b75656f567..336ad424f8 100644
--- a/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectHourGlassPhpTest.php
@@ -41,7 +41,7 @@ class RedirectHourGlassPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -52,7 +52,7 @@ class RedirectHourGlassPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -94,7 +94,7 @@ class RedirectHourGlassPhpTest extends TestCase
             ->with(ModuleChartInterface::class)
             ->willReturn(new Collection());
 
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -113,7 +113,7 @@ class RedirectHourGlassPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
index 303b30e743..093d4f77b9 100644
--- a/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
@@ -39,7 +39,7 @@ class RedirectIndiListPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectIndiListPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -86,7 +86,7 @@ class RedirectIndiListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
@@ -103,7 +103,7 @@ class RedirectIndiListPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php b/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php
index a70ce08e0b..1c312532e6 100644
--- a/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectIndividualPhpTest.php
@@ -39,7 +39,7 @@ class RedirectIndividualPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -50,7 +50,7 @@ class RedirectIndividualPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
         $individual
             ->method('url')
             ->willReturn('https://www.example.com');
@@ -76,7 +76,7 @@ class RedirectIndividualPhpTest extends TestCase
 
     public function testNoSuchRecord(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -112,7 +112,7 @@ class RedirectIndividualPhpTest extends TestCase
 
     public function testMissingXrefParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectFamilyPhp($tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php b/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php
index 1e63664503..5ef703b194 100644
--- a/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectLifeSpanPhpTest.php
@@ -38,7 +38,7 @@ class RedirectLifeSpanPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -80,7 +80,7 @@ class RedirectLifeSpanPhpTest extends TestCase
             ->with(ModuleChartInterface::class)
             ->willReturn(new Collection());
 
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -99,7 +99,7 @@ class RedirectLifeSpanPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
index 85365630f0..2e356cbba5 100644
--- a/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
@@ -39,7 +39,7 @@ class RedirectMediaListPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectMediaListPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -86,7 +86,7 @@ class RedirectMediaListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
@@ -103,7 +103,7 @@ class RedirectMediaListPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php b/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php
index 796ebff3e6..1e79870881 100644
--- a/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectMediaViewerPhpTest.php
@@ -39,7 +39,7 @@ class RedirectMediaViewerPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -50,7 +50,7 @@ class RedirectMediaViewerPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $media = $this->createMock(Media::class);
+        $media = $this->createStub(Media::class);
         $media
             ->method('url')
             ->willReturn('https://www.example.com');
@@ -76,7 +76,7 @@ class RedirectMediaViewerPhpTest extends TestCase
 
     public function testNoSuchRecord(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -112,7 +112,7 @@ class RedirectMediaViewerPhpTest extends TestCase
 
     public function testMissingTreeParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectFamilyPhp($tree_service);
 
@@ -125,7 +125,7 @@ class RedirectMediaViewerPhpTest extends TestCase
 
     public function testMissingXrefParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectFamilyPhp($tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php b/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php
index a88351d089..fe254c5e01 100644
--- a/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectModulePhpTest.php
@@ -41,7 +41,7 @@ class RedirectModulePhpTest extends TestCase
 
     public function testRedirectPedigreeMap(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -52,7 +52,7 @@ class RedirectModulePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -91,7 +91,7 @@ class RedirectModulePhpTest extends TestCase
 
     public function testRedirectInteractiveTree(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -102,7 +102,7 @@ class RedirectModulePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -141,7 +141,7 @@ class RedirectModulePhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service  = $this->createMock(ModuleService::class);
+        $module_service  = $this->createStub(ModuleService::class);
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
             ->expects($this->once())
@@ -162,7 +162,7 @@ class RedirectModulePhpTest extends TestCase
 
     public function testNoSuchIndividual(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -175,7 +175,7 @@ class RedirectModulePhpTest extends TestCase
             ->willReturn(null);
 
         Registry::individualFactory($individual_factory);
-        $module_service  = $this->createMock(ModuleService::class);
+        $module_service  = $this->createStub(ModuleService::class);
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
             ->expects($this->once())
@@ -196,7 +196,7 @@ class RedirectModulePhpTest extends TestCase
 
     public function testPedigreeMapModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -207,7 +207,7 @@ class RedirectModulePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -239,7 +239,7 @@ class RedirectModulePhpTest extends TestCase
 
     public function testInteractiveTreeModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -250,7 +250,7 @@ class RedirectModulePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
diff --git a/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
index c923506827..0221f637bc 100644
--- a/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
@@ -39,7 +39,7 @@ class RedirectNoteListPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectNoteListPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -86,7 +86,7 @@ class RedirectNoteListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
@@ -103,7 +103,7 @@ class RedirectNoteListPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php b/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php
index d2028170cf..78c191206d 100644
--- a/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectNotePhpTest.php
@@ -39,7 +39,7 @@ class RedirectNotePhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -50,7 +50,7 @@ class RedirectNotePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $note = $this->createMock(Note::class);
+        $note = $this->createStub(Note::class);
         $note
             ->method('url')
             ->willReturn('https://www.example.com');
@@ -76,7 +76,7 @@ class RedirectNotePhpTest extends TestCase
 
     public function testNoSuchRecord(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -95,7 +95,7 @@ class RedirectNotePhpTest extends TestCase
 
     public function testMissingXrefParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectNotePhp($tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php b/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
index 8e9e87833a..0933a795e5 100644
--- a/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
@@ -42,7 +42,7 @@ class RedirectPedigreePhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -53,7 +53,7 @@ class RedirectPedigreePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -89,7 +89,7 @@ class RedirectPedigreePhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -100,7 +100,7 @@ class RedirectPedigreePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
@@ -117,7 +117,7 @@ class RedirectPedigreePhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service  = $this->createMock(ModuleService::class);
+        $module_service  = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
index a962e36bbc..b9d873937a 100644
--- a/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
@@ -39,7 +39,7 @@ class RedirectPlaceListPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectPlaceListPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -86,7 +86,7 @@ class RedirectPlaceListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
@@ -103,7 +103,7 @@ class RedirectPlaceListPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
index 2a28e86840..7b69cb94e2 100644
--- a/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
@@ -42,7 +42,7 @@ class RedirectRelationshipPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -53,7 +53,7 @@ class RedirectRelationshipPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -89,7 +89,7 @@ class RedirectRelationshipPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -100,7 +100,7 @@ class RedirectRelationshipPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
@@ -117,7 +117,7 @@ class RedirectRelationshipPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service  = $this->createMock(ModuleService::class);
+        $module_service  = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
index d9fadc881a..20320a357e 100644
--- a/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
@@ -39,7 +39,7 @@ class RedirectRepoListPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectRepoListPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -86,7 +86,7 @@ class RedirectRepoListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
@@ -103,7 +103,7 @@ class RedirectRepoListPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php b/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php
index de7ced17e4..f9353dd67a 100644
--- a/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectReportEnginePhpTest.php
@@ -35,7 +35,7 @@ class RedirectReportEnginePhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
diff --git a/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php
index 309adcff82..d9850ae278 100644
--- a/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRepositoryPhpTest.php
@@ -39,7 +39,7 @@ class RedirectRepositoryPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -50,7 +50,7 @@ class RedirectRepositoryPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $repository = $this->createMock(Repository::class);
+        $repository = $this->createStub(Repository::class);
         $repository
             ->method('url')
             ->willReturn('https://www.example.com');
@@ -76,7 +76,7 @@ class RedirectRepositoryPhpTest extends TestCase
 
     public function testNoSuchRecord(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -95,7 +95,7 @@ class RedirectRepositoryPhpTest extends TestCase
 
     public function testMissingXrefParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectRepositoryPhp($tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
index 49c193886a..f9b460f0eb 100644
--- a/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
@@ -39,7 +39,7 @@ class RedirectSourceListPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectSourceListPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -86,7 +86,7 @@ class RedirectSourceListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
@@ -103,7 +103,7 @@ class RedirectSourceListPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php b/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php
index 2e755b897d..b6f33217f9 100644
--- a/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectSourcePhpTest.php
@@ -39,7 +39,7 @@ class RedirectSourcePhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -50,7 +50,7 @@ class RedirectSourcePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $source = $this->createMock(Source::class);
+        $source = $this->createStub(Source::class);
         $source
             ->method('url')
             ->willReturn('https://www.example.com');
@@ -76,7 +76,7 @@ class RedirectSourcePhpTest extends TestCase
 
     public function testNoSuchRecord(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
@@ -95,7 +95,7 @@ class RedirectSourcePhpTest extends TestCase
 
     public function testMissingXrefParameter(): void
     {
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
 
         $handler = new RedirectSourcePhp($tree_service);
 
diff --git a/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php b/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
index b633c58141..e6edfe85ad 100644
--- a/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
@@ -39,7 +39,7 @@ class RedirectStatisticsPhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -75,7 +75,7 @@ class RedirectStatisticsPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -86,7 +86,7 @@ class RedirectStatisticsPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
@@ -103,7 +103,7 @@ class RedirectStatisticsPhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service  = $this->createMock(ModuleService::class);
+        $module_service  = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php b/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
index bd222bb62a..aee2ee7f60 100644
--- a/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
@@ -42,7 +42,7 @@ class RedirectTimeLinePhpTest extends TestCase
 
     public function testRedirect(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -53,7 +53,7 @@ class RedirectTimeLinePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $individual = $this->createMock(Individual::class);
+        $individual = $this->createStub(Individual::class);
 
         $individual_factory = $this->createMock(IndividualFactory::class);
         $individual_factory
@@ -89,7 +89,7 @@ class RedirectTimeLinePhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $tree = $this->createMock(Tree::class);
+        $tree = $this->createStub(Tree::class);
         $tree
             ->method('name')
             ->willReturn('tree1');
@@ -100,7 +100,7 @@ class RedirectTimeLinePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = $this->createMock(ModuleService::class);
+        $module_service = $this->createStub(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
@@ -117,7 +117,7 @@ class RedirectTimeLinePhpTest extends TestCase
 
     public function testNoSuchTree(): void
     {
-        $module_service  = $this->createMock(ModuleService::class);
+        $module_service  = $this->createStub(ModuleService::class);
 
         $tree_service = $this->createMock(TreeService::class);
         $tree_service
diff --git a/tests/app/Http/RequestHandlers/SiteLogsDataTest.php b/tests/app/Http/RequestHandlers/SiteLogsDataTest.php
index 86c9bf5efe..38baf9cdb2 100644
--- a/tests/app/Http/RequestHandlers/SiteLogsDataTest.php
+++ b/tests/app/Http/RequestHandlers/SiteLogsDataTest.php
@@ -38,15 +38,15 @@ class SiteLogsDataTest extends TestCase
             ['tree' => 'a', 'from' => 'b', 'to' => 'c', 'type' => 'd', 'text' => 'e', 'ip' => 'f', 'username' => 'g']
         );
 
-        $query = $this->createMock(Builder::class);
+        $query = $this->createStub(Builder::class);
 
-        $site_logs_service = $this->createMock(SiteLogsService::class);
+        $site_logs_service = $this->createStub(SiteLogsService::class);
         $site_logs_service->method('logsQuery')->willReturn($query);
 
-        $response = $this->createMock(ResponseInterface::class);
+        $response = $this->createStub(ResponseInterface::class);
         $response->method('getStatusCode')->willReturn(StatusCodeInterface::STATUS_OK);
 
-        $data_tables_service = $this->createMock(DatatablesService::class);
+        $data_tables_service = $this->createStub(DatatablesService::class);
         $data_tables_service->method('handleQuery')->willReturn($response);
 
         $handler  = new SiteLogsData($data_tables_service, $site_logs_service);
diff --git a/tests/app/Http/RequestHandlers/SiteLogsDeleteTest.php b/tests/app/Http/RequestHandlers/SiteLogsDeleteTest.php
index 284e3d08fe..851c9b6a67 100644
--- a/tests/app/Http/RequestHandlers/SiteLogsDeleteTest.php
+++ b/tests/app/Http/RequestHandlers/SiteLogsDeleteTest.php
@@ -32,10 +32,10 @@ class SiteLogsDeleteTest extends TestCase
     {
         $request = self::createRequest();
 
-        $query = $this->createMock(Builder::class);
+        $query = $this->createStub(Builder::class);
         $query->method('delete');
 
-        $site_logs_service = $this->createMock(SiteLogsService::class);
+        $site_logs_service = $this->createStub(SiteLogsService::class);
         $site_logs_service->method('logsQuery')->willReturn($query);
 
         $handler  = new SiteLogsDelete($site_logs_service);
diff --git a/tests/app/Http/RequestHandlers/SiteLogsDownloadTest.php b/tests/app/Http/RequestHandlers/SiteLogsDownloadTest.php
index d00e692da6..94119edec9 100644
--- a/tests/app/Http/RequestHandlers/SiteLogsDownloadTest.php
+++ b/tests/app/Http/RequestHandlers/SiteLogsDownloadTest.php
@@ -33,16 +33,16 @@ class SiteLogsDownloadTest extends TestCase
     {
         $request = self::createRequest();
 
-        $query1 = $this->createMock(Builder::class);
-        $query2 = $this->createMock(Builder::class);
-        $rows1  = $this->createMock(Collection::class);
-        $rows2  = $this->createMock(Collection::class);
+        $query1 = $this->createStub(Builder::class);
+        $query2 = $this->createStub(Builder::class);
+        $rows1  = $this->createStub(Collection::class);
+        $rows2  = $this->createStub(Collection::class);
         $query1->method('orderBy')->willReturn($query2);
         $query2->method('get')->willReturn($rows1);
         $rows1->method('map')->willReturn($rows2);
         $rows2->method('implode')->willReturn('foo,bar');
 
-        $site_logs_service = $this->createMock(SiteLogsService::class);
+        $site_logs_service = $this->createStub(SiteLogsService::class);
         $site_logs_service->method('logsQuery')->willReturn($query1);
 
         $handler  = new SiteLogsDownload($site_logs_service);
diff --git a/tests/app/Http/RequestHandlers/SiteLogsPageTest.php b/tests/app/Http/RequestHandlers/SiteLogsPageTest.php
index f5045bfd1b..5f89fa4c91 100644
--- a/tests/app/Http/RequestHandlers/SiteLogsPageTest.php
+++ b/tests/app/Http/RequestHandlers/SiteLogsPageTest.php
@@ -35,10 +35,10 @@ class SiteLogsPageTest extends TestCase
     {
         $request = self::createRequest();
 
-        $tree_service = $this->createMock(TreeService::class);
+        $tree_service = $this->createStub(TreeService::class);
         $tree_service->method('all')->willReturn(new Collection());
 
-        $user_service = $this->createMock(UserService::class);
+        $user_service = $this->createStub(UserService::class);
         $user_service->method('all')->willReturn(new Collection());
 
         $handler  = new SiteLogsPage($tree_service, $user_service);
diff --git a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php
index 7da213934f..6cfb8d0578 100644
--- a/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php
+++ b/tests/app/Http/RequestHandlers/UpgradeWizardStepTest.php
@@ -62,7 +62,7 @@ class UpgradeWizardStepTest extends TestCase
 
     public function testStepCheckOK(): void
     {
-        $mock_upgrade_service = $this->createMock(UpgradeService::class);
+        $mock_upgrade_service = $this->createStub(UpgradeService::class);
         $mock_upgrade_service->method('latestVersion')->willReturn('999.999.999');
         $handler = new UpgradeWizardStep(
             new GedcomExportService(new Psr17Factory(), new Psr17Factory()),
@@ -82,7 +82,7 @@ class UpgradeWizardStepTest extends TestCase
     {
         $this->expectException(HttpServerErrorException::class);
 
-        $mock_upgrade_service = $this->createMock(UpgradeService::class);
+        $mock_upgrade_service = $this->createStub(UpgradeService::class);
         $mock_upgrade_service->method('latestVersion')->willReturn('');
         $handler = new UpgradeWizardStep(
             new GedcomExportService(new Psr17Factory(), new Psr17Factory()),
@@ -100,7 +100,7 @@ class UpgradeWizardStepTest extends TestCase
     {
         $this->expectException(HttpServerErrorException::class);
 
-        $mock_upgrade_service = $this->createMock(UpgradeService::class);
+        $mock_upgrade_service = $this->createStub(UpgradeService::class);
         $mock_upgrade_service->method('latestVersion')->willReturn('0.0.0');
         $handler = new UpgradeWizardStep(
             new GedcomExportService(new Psr17Factory(), new Psr17Factory()),
@@ -173,7 +173,7 @@ class UpgradeWizardStepTest extends TestCase
     {
         $tree            = $this->importTree('demo.ged');
         $all_trees       = Collection::make([$tree->name() => $tree]);
-        $tree_service    = $this->createMock(TreeService::class);
+        $tree_service    = $this->createStub(TreeService::class);
         $tree_service->method('all')->willReturn($all_trees);
 
         $handler = new UpgradeWizardStep(
@@ -199,7 +199,7 @@ class UpgradeWizardStepTest extends TestCase
     {
         $this->expectException(HttpServerErrorException::class);
 
-        $mock_upgrade_service = $this->createMock(UpgradeService::class);
+        $mock_upgrade_service = $this->createStub(UpgradeService::class);
         $mock_upgrade_service->method('downloadFile')->will($this->throwException(new Exception()));
         $handler = new UpgradeWizardStep(
             new GedcomExportService(new Psr17Factory(), new Psr17Factory()),
@@ -215,7 +215,7 @@ class UpgradeWizardStepTest extends TestCase
 
     public function testStepDownload(): void
     {
-        $mock_upgrade_service = $this->createMock(UpgradeService::class);
+        $mock_upgrade_service = $this->createStub(UpgradeService::class);
         $mock_upgrade_service->method('downloadFile')->willReturn(123456);
         $handler = new UpgradeWizardStep(
             new GedcomExportService(new Psr17Factory(), new Psr17Factory()),
@@ -233,7 +233,7 @@ class UpgradeWizardStepTest extends TestCase
 
     public function testStepUnzip(): void
     {
-        $mock_upgrade_service = $this->createMock(UpgradeService::class);
+        $mock_upgrade_service = $this->createStub(UpgradeService::class);
         $mock_upgrade_service->method('webtreesZipContents')->willReturn(new Collection());
         $handler = new UpgradeWizardStep(
             new GedcomExportService(new Psr17Factory(), new Psr17Factory()),