Update PHPunit tests, to distinguish stubs from mocks

42 files changed, 152 insertions, 148 deletions

diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php
index 8dca70fad7..3030f65f8c 100644
--- a/tests/app/Census/CensusColumnAgeMarriedTest.php
+++ b/tests/app/Census/CensusColumnAgeMarriedTest.php
@@ -36,7 +36,7 @@ class CensusColumnAgeMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -67,7 +67,7 @@ class CensusColumnAgeMarriedTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
index 814f666675..a385372dd6 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
index eebc038fe8..fc0f0cc1f8 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaTest.php b/tests/app/Census/CensusColumnConditionCanadaTest.php
index a3970ce038..528154edef 100644
--- a/tests/app/Census/CensusColumnConditionCanadaTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
index 0c19571618..5a79c187b5 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
index 418a583f82..ff902d625d 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
index 631f427212..82d56c9ee5 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 04866474bc..62c8c6819a 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionDanishTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index b210e729eb..5b34feddd5 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionEnglishTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 725a44b97c..7f12c13471 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 2070765521..7d041a540f 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index a3418d8365..1660d67820 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index ecd70dd926..0b39fade27 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 284f1a7c8e..58ca49cfb8 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -161,7 +161,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -180,7 +180,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -199,7 +199,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -218,7 +218,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index 07184aa2fd..7ebaf84da1 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -163,7 +163,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -182,7 +182,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -201,7 +201,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -220,7 +220,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 205775f9fb..6ce674b433 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -63,7 +63,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyFactsMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -82,7 +82,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyFactsFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -162,7 +162,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyUnmarriedMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -181,7 +181,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testNoFamilyUnmarriedFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -200,7 +200,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testChildMale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
@@ -219,7 +219,7 @@ class CensusColumnConditionUsTest extends TestCase
 
     public function testChildFemale(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('getMarriageDate')->willReturn(new Date(''));
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 80216605b6..fea7ce84a0 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -36,7 +36,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -55,7 +55,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -74,7 +74,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -90,7 +90,7 @@ class CensusColumnMarriedWithinYearTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index 5dbf59abe8..e2c5e6f0af 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -36,7 +36,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 DEC 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -55,7 +55,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('01 JAN 1859'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -74,7 +74,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('02 JUN 1860'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -90,7 +90,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'])->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index 35ab08ad4d..6472371925 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -41,7 +41,7 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testNoBirthPlace(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock(''));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
@@ -55,7 +55,7 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testPlaceCountry(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Australia'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
@@ -69,7 +69,7 @@ class CensusColumnNationalityTest extends TestCase
 
     public function testBritish(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection());
 
@@ -97,7 +97,7 @@ class CensusColumnNationalityTest extends TestCase
         $fact2->method('place')->willReturn($place2);
         $fact2->method('date')->willReturn(new Date('1865'));
 
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England'));
         $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection([
             $fact1,
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index 2aee86cf27..e8b4ec7d50 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -31,7 +31,7 @@ class CensusColumnOccupationTest extends TestCase
 {
     public function testNoOccupation(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection());
 
         $census = self::createStub(CensusInterface::class);
@@ -46,7 +46,7 @@ class CensusColumnOccupationTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('value')->willReturn('Farmer');
 
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $individual->method('facts')->with(['OCCU'])->willReturn(new Collection([$fact]));
 
         $census = self::createStub(CensusInterface::class);
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 9120a07822..8e6da82e68 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -47,7 +47,7 @@ class CensusColumnReligionTest extends TestCase
 
     public function testRecordReligion(): void
     {
-        $individual = self::createStub(Individual::class);
+        $individual = $this->createMock(Individual::class);
         $fact       = self::createStub(Fact::class);
         $fact->method('value')->willReturn('Jedi');
         $individual->method('facts')->with(['RELI'])->willReturn(new Collection([$fact]));
@@ -62,7 +62,7 @@ class CensusColumnReligionTest extends TestCase
     public function testEventReligion(): void
     {
         $individual = $this->createMock(Individual::class);
-        $fact       = self::createStub(Fact::class);
+        $fact       = $this->createMock(Fact::class);
         $fact->method('attribute')->with('RELI')->willReturn('Jedi');
         $individual
             ->expects($this->exactly(2))
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index 72195a2ea1..e9eb02e334 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -46,7 +46,7 @@ class CensusColumnYearsMarriedTest extends TestCase
 
     public function testNoMarriage(): void
     {
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection());
 
         $individual = self::createStub(Individual::class);
@@ -65,7 +65,7 @@ class CensusColumnYearsMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date(''));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -84,7 +84,7 @@ class CensusColumnYearsMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('1861'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
@@ -103,7 +103,7 @@ class CensusColumnYearsMarriedTest extends TestCase
         $fact = self::createStub(Fact::class);
         $fact->method('date')->willReturn(new Date('OCT 1851'));
 
-        $family = self::createStub(Family::class);
+        $family = $this->createMock(Family::class);
         $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact]));
 
         $individual = self::createStub(Individual::class);
diff --git a/tests/app/Http/Middleware/AuthAdministratorTest.php b/tests/app/Http/Middleware/AuthAdministratorTest.php
index b679612469..090abd7748 100644
--- a/tests/app/Http/Middleware/AuthAdministratorTest.php
+++ b/tests/app/Http/Middleware/AuthAdministratorTest.php
@@ -38,7 +38,7 @@ class AuthAdministratorTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('1');
 
         $request    = self::createRequest()->withAttribute('user', $user);
@@ -57,7 +57,7 @@ class AuthAdministratorTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
         $request    = self::createRequest()->withAttribute('user', $user);
diff --git a/tests/app/Http/Middleware/AuthEditorTest.php b/tests/app/Http/Middleware/AuthEditorTest.php
index eac3405010..978d18950d 100644
--- a/tests/app/Http/Middleware/AuthEditorTest.php
+++ b/tests/app/Http/Middleware/AuthEditorTest.php
@@ -39,10 +39,10 @@ class AuthEditorTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_EDITOR);
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
@@ -61,10 +61,10 @@ class AuthEditorTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MEMBER);
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
diff --git a/tests/app/Http/Middleware/AuthManagerTest.php b/tests/app/Http/Middleware/AuthManagerTest.php
index 62fa31fd7c..7eec147164 100644
--- a/tests/app/Http/Middleware/AuthManagerTest.php
+++ b/tests/app/Http/Middleware/AuthManagerTest.php
@@ -39,10 +39,10 @@ class AuthManagerTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MANAGER);
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
@@ -61,10 +61,10 @@ class AuthManagerTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MODERATOR);
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
diff --git a/tests/app/Http/Middleware/AuthMemberTest.php b/tests/app/Http/Middleware/AuthMemberTest.php
index 7e4404c6a3..8bac242ba3 100644
--- a/tests/app/Http/Middleware/AuthMemberTest.php
+++ b/tests/app/Http/Middleware/AuthMemberTest.php
@@ -39,10 +39,10 @@ class AuthMemberTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MEMBER);
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
@@ -61,10 +61,10 @@ class AuthMemberTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn('');
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
diff --git a/tests/app/Http/Middleware/AuthModeratorTest.php b/tests/app/Http/Middleware/AuthModeratorTest.php
index 099c632c33..9f4028a101 100644
--- a/tests/app/Http/Middleware/AuthModeratorTest.php
+++ b/tests/app/Http/Middleware/AuthModeratorTest.php
@@ -39,10 +39,10 @@ class AuthModeratorTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MODERATOR);
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
@@ -61,10 +61,10 @@ class AuthModeratorTest extends TestCase
         $handler = self::createStub(RequestHandlerInterface::class);
         $handler->method('handle')->willReturn(response('lorem ipsum'));
 
-        $user = self::createStub(User::class);
+        $user = $this->createMock(User::class);
         $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('');
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_EDITOR);
 
         $request    = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user);
diff --git a/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php b/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
index e03d6c0605..5ccef46c61 100644
--- a/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectBranchesPhpTest.php
@@ -91,7 +91,7 @@ class RedirectBranchesPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class)
diff --git a/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php b/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
index 3ea4865a5f..45dea706ae 100644
--- a/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectDescendancyPhpTest.php
@@ -87,7 +87,7 @@ class RedirectDescendancyPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class)
diff --git a/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php b/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
index e39b1e1941..4e630e647c 100644
--- a/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectFamilyBookPhpTest.php
@@ -87,7 +87,7 @@ class RedirectFamilyBookPhpTest extends TestCase
 
     public function testModuleDisabled(): void
     {
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class)
diff --git a/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
index 5b4349f097..facb50480b 100644
--- a/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectIndiListPhpTest.php
@@ -86,8 +86,9 @@ class RedirectIndiListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
+            ->expects($this->once())
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
             ->willReturn(new Collection());
diff --git a/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
index b8b20ad1a0..a3d413b60f 100644
--- a/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectMediaListPhpTest.php
@@ -86,8 +86,9 @@ class RedirectMediaListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
+            ->expects($this->once())
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
             ->willReturn(new Collection());
diff --git a/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
index 468a48e2bc..1598ec35c7 100644
--- a/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectNoteListPhpTest.php
@@ -86,8 +86,9 @@ class RedirectNoteListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
+            ->expects($this->once())
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
             ->willReturn(new Collection());
diff --git a/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php b/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
index bbbb830c7d..54723c323f 100644
--- a/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectPedigreePhpTest.php
@@ -100,7 +100,7 @@ class RedirectPedigreePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
diff --git a/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
index 105c9cd816..10ce36942a 100644
--- a/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectPlaceListPhpTest.php
@@ -86,7 +86,7 @@ class RedirectPlaceListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
diff --git a/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
index 62a554f20b..d8b0d57377 100644
--- a/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRelationshipPhpTest.php
@@ -100,7 +100,7 @@ class RedirectRelationshipPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
diff --git a/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
index 9edf5583f9..3a850305e9 100644
--- a/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectRepoListPhpTest.php
@@ -86,7 +86,7 @@ class RedirectRepoListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
diff --git a/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php b/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
index 74c7afe4eb..7bb6a6795d 100644
--- a/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectSourceListPhpTest.php
@@ -86,8 +86,9 @@ class RedirectSourceListPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
+            ->expects($this->once())
             ->method('findByComponent')
             ->with(ModuleListInterface::class, $tree, new GuestUser())
             ->willReturn(new Collection());
diff --git a/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php b/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
index b6c65b7dc9..dd2f0ded56 100644
--- a/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectStatisticsPhpTest.php
@@ -86,7 +86,7 @@ class RedirectStatisticsPhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
diff --git a/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php b/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
index ce02bbeb26..bec89194c7 100644
--- a/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
+++ b/tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php
@@ -100,7 +100,7 @@ class RedirectTimeLinePhpTest extends TestCase
             ->method('all')
             ->willReturn(new Collection(['tree1' => $tree]));
 
-        $module_service = self::createStub(ModuleService::class);
+        $module_service = $this->createMock(ModuleService::class);
         $module_service
             ->method('findByComponent')
             ->with(ModuleChartInterface::class, $tree, new GuestUser())
diff --git a/tests/app/Services/GedcomEditServiceTest.php b/tests/app/Services/GedcomEditServiceTest.php
index 7d040c65da..3578c08918 100644
--- a/tests/app/Services/GedcomEditServiceTest.php
+++ b/tests/app/Services/GedcomEditServiceTest.php
@@ -116,7 +116,7 @@ class GedcomEditServiceTest extends TestCase
     {
         $gedcom_edit_service = new GedcomEditService();
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getPreference')->with('QUICK_REQUIRED_FAMFACTS')->willReturn($required_famfacts);
 
         $new_facts = $gedcom_edit_service->newFamilyFacts($tree);
@@ -141,7 +141,7 @@ class GedcomEditServiceTest extends TestCase
     ): void {
         $gedcom_edit_service = new GedcomEditService();
 
-        $tree = self::createStub(Tree::class);
+        $tree = $this->createMock(Tree::class);
         $tree->method('getPreference')->with('QUICK_REQUIRED_FACTS')->willReturn($required_facts);
 
         $new_facts = $gedcom_edit_service->newIndividualFacts($tree, $sex, $names);
diff --git a/tests/app/ValidatorTest.php b/tests/app/ValidatorTest.php
index 3833e25183..1190ddee51 100644
--- a/tests/app/ValidatorTest.php
+++ b/tests/app/ValidatorTest.php
@@ -333,7 +333,7 @@ class ValidatorTest extends TestCase
 
     public function testIsLocalUrlParameter(): void
     {
-        $request = self::createStub(ServerRequestInterface::class);
+        $request = $this->createMock(ServerRequestInterface::class);
         $request
             ->method('getAttribute')
             ->with('base_url')->willReturn('http://example.local/wt');
@@ -347,7 +347,7 @@ class ValidatorTest extends TestCase
 
     public function testIsLocalUrlParameterWrongScheme(): void
     {
-        $request = self::createStub(ServerRequestInterface::class);
+        $request = $this->createMock(ServerRequestInterface::class);
         $request
             ->method('getAttribute')
             ->with('base_url')
@@ -363,7 +363,7 @@ class ValidatorTest extends TestCase
 
     public function testIsLocalUrlParameterWrongDomain(): void
     {
-        $request = self::createStub(ServerRequestInterface::class);
+        $request = $this->createMock(ServerRequestInterface::class);
         $request
             ->method('getAttribute')
             ->with('base_url')