diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2025-12-28 18:32:37 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2025-12-28 18:32:44 +0000 |
| commit | f8346c42093ef55bbe7e4bdcb0319a30638a6e12 (patch) | |
| tree | 888cd8aaa1022da27a5d5e36f6caa8488f1fe5ff | |
| parent | b094da64a7219ac63c0d2da63d5f935a9063e22f (diff) | |
| download | webtrees-f8346c42093ef55bbe7e4bdcb0319a30638a6e12.tar.gz webtrees-f8346c42093ef55bbe7e4bdcb0319a30638a6e12.tar.bz2 webtrees-f8346c42093ef55bbe7e4bdcb0319a30638a6e12.zip | |
Fix: createStub is a static method, assertSame/assertCount are dynamic methods
169 files changed, 1516 insertions, 1516 deletions
diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php index 9b3419b2e3..b334b70a9b 100644 --- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php @@ -30,10 +30,10 @@ class CensusColumnAgeFemale5YearsTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnAgeFemale5Years($census, '', ''); @@ -42,11 +42,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase public function testFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnAgeFemale5Years($census, '', ''); @@ -56,11 +56,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnAgeFemale5Years($census, '', ''); @@ -70,11 +70,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase public function testLessThanOneYear(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1800'); $column = new CensusColumnAgeFemale5Years($census, '', ''); @@ -84,11 +84,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase public function testLessThanFifteenYears(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1814'); $column = new CensusColumnAgeFemale5Years($census, '', ''); @@ -98,11 +98,11 @@ class CensusColumnAgeFemale5YearsTest extends TestCase public function testRoundedDownToFiveYears(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1844'); $column = new CensusColumnAgeFemale5Years($census, '', ''); diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php index 7725f5f6a2..ecbbe958d4 100644 --- a/tests/app/Census/CensusColumnAgeFemaleTest.php +++ b/tests/app/Census/CensusColumnAgeFemaleTest.php @@ -30,10 +30,10 @@ class CensusColumnAgeFemaleTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnAgeFemale($census, '', ''); @@ -42,11 +42,11 @@ class CensusColumnAgeFemaleTest extends TestCase public function testFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnAgeFemale($census, '', ''); @@ -56,11 +56,11 @@ class CensusColumnAgeFemaleTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnAgeFemale($census, '', ''); @@ -70,11 +70,11 @@ class CensusColumnAgeFemaleTest extends TestCase public function testLessThanOneYear(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1800'); $column = new CensusColumnAgeFemale($census, '', ''); diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php index bb1da0550d..0343120b88 100644 --- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php @@ -30,11 +30,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnAgeMale5Years($census, '', ''); @@ -44,10 +44,10 @@ class CensusColumnAgeMale5YearsTest extends TestCase public function testFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnAgeMale5Years($census, '', ''); @@ -56,11 +56,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnAgeMale5Years($census, '', ''); @@ -70,11 +70,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase public function testLessThanOneYear(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1800'); $column = new CensusColumnAgeMale5Years($census, '', ''); @@ -84,11 +84,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase public function testLessThanFifteenYears(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1814'); $column = new CensusColumnAgeMale5Years($census, '', ''); @@ -98,11 +98,11 @@ class CensusColumnAgeMale5YearsTest extends TestCase public function testRoundedDownToFiveYears(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1844'); $column = new CensusColumnAgeMale5Years($census, '', ''); diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php index 9fed27173d..42893cb372 100644 --- a/tests/app/Census/CensusColumnAgeMaleTest.php +++ b/tests/app/Census/CensusColumnAgeMaleTest.php @@ -30,11 +30,11 @@ class CensusColumnAgeMaleTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnAgeMale($census, '', ''); @@ -44,10 +44,10 @@ class CensusColumnAgeMaleTest extends TestCase public function testFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnAgeMale($census, '', ''); @@ -56,11 +56,11 @@ class CensusColumnAgeMaleTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnAgeMale($census, '', ''); @@ -70,11 +70,11 @@ class CensusColumnAgeMaleTest extends TestCase public function testLessThanOneYear(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1800'); $column = new CensusColumnAgeMale($census, '', ''); diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php index cfd4d1e1bc..a693eab28f 100644 --- a/tests/app/Census/CensusColumnAgeMarriedTest.php +++ b/tests/app/Census/CensusColumnAgeMarriedTest.php @@ -33,17 +33,17 @@ class CensusColumnAgeMarriedTest extends TestCase { public function testAgeMarried(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('01 DEC 1859')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('15 MAR 1840')); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnAgeMarried($census, '', ''); @@ -53,11 +53,11 @@ class CensusColumnAgeMarriedTest extends TestCase public function testNoBirthDate(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('')); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnAgeMarried($census, '', ''); @@ -67,14 +67,14 @@ class CensusColumnAgeMarriedTest extends TestCase public function testNoMarriage(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('')); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnAgeMarried($census, '', ''); @@ -84,11 +84,11 @@ class CensusColumnAgeMarriedTest extends TestCase public function testNoSpouseFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('15 MAR 1840')); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnAgeMarried($census, '', ''); diff --git a/tests/app/Census/CensusColumnAgeNextBirthDayTest.php b/tests/app/Census/CensusColumnAgeNextBirthDayTest.php index 3bedaa0034..7d1073d9bc 100644 --- a/tests/app/Census/CensusColumnAgeNextBirthDayTest.php +++ b/tests/app/Census/CensusColumnAgeNextBirthDayTest.php @@ -30,10 +30,10 @@ class CensusColumnAgeNextBirthDayTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnAgeNextBirthDay($census, '', ''); diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php index d7db04b265..a58371fab4 100644 --- a/tests/app/Census/CensusColumnAgeTest.php +++ b/tests/app/Census/CensusColumnAgeTest.php @@ -30,10 +30,10 @@ class CensusColumnAgeTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('01 JAN 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnAge($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php index ce6e456dd0..2ffa230c9d 100644 --- a/tests/app/Census/CensusColumnBirthDateTest.php +++ b/tests/app/Census/CensusColumnBirthDateTest.php @@ -30,10 +30,10 @@ class CensusColumnBirthDateTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthDate($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php index a90cc0cf80..de4498fab2 100644 --- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php +++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php @@ -30,10 +30,10 @@ class CensusColumnBirthDayDotMonthYearTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthDayDotMonthYear($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php index 56bf903158..dcb92356f9 100644 --- a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php +++ b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php @@ -30,10 +30,10 @@ class CensusColumnBirthDayMonthYearTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthDayMonthYear($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php index 543885aa58..71f7207321 100644 --- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php +++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php @@ -30,10 +30,10 @@ class CensusColumnBirthDaySlashMonthTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthDaySlashMonth($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php index dbc56f832c..7ea975254b 100644 --- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php +++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php @@ -30,10 +30,10 @@ class CensusColumnBirthDaySlashMonthYearTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthDaySlashMonthYear($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthDayTest.php b/tests/app/Census/CensusColumnBirthDayTest.php index 522ec5b35d..45fcc982a5 100644 --- a/tests/app/Census/CensusColumnBirthDayTest.php +++ b/tests/app/Census/CensusColumnBirthDayTest.php @@ -31,16 +31,16 @@ class CensusColumnBirthDayTest extends TestCase { public function testGenerateColumn(): void { - $cal_date = $this->createStub(GregorianDate::class); + $cal_date = self::createStub(GregorianDate::class); $cal_date->method('format')->willReturn('30'); - $date = $this->createStub(Date::class); + $date = self::createStub(Date::class); $date->method('minimumDate')->willReturn($cal_date); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn($date); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthDay($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthMonthDayTest.php b/tests/app/Census/CensusColumnBirthMonthDayTest.php index 9ebd90f4d1..cd4957ed56 100644 --- a/tests/app/Census/CensusColumnBirthMonthDayTest.php +++ b/tests/app/Census/CensusColumnBirthMonthDayTest.php @@ -30,10 +30,10 @@ class CensusColumnBirthMonthDayTest extends TestCase { public function testGenerateColumn(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthMonthDay($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php index 36851c3794..e45df94e81 100644 --- a/tests/app/Census/CensusColumnBirthMonthTest.php +++ b/tests/app/Census/CensusColumnBirthMonthTest.php @@ -31,16 +31,16 @@ class CensusColumnBirthMonthTest extends TestCase { public function testGenerateColumn(): void { - $cal_date = $this->createStub(GregorianDate::class); + $cal_date = self::createStub(GregorianDate::class); $cal_date->method('format')->willReturn('Jan'); - $date = $this->createStub(Date::class); + $date = self::createStub(Date::class); $date->method('minimumDate')->willReturn($cal_date); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn($date); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthMonth($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php index e713f94fee..c393472e5b 100644 --- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php @@ -30,7 +30,7 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase { private function getPlaceMock(string $place): Place { - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); return $placeMock; @@ -38,10 +38,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase public function testForeignCountry(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Westminster, London, England')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('United States'); $column = new CensusColumnBirthPlaceSimple($census, '', ''); @@ -51,10 +51,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase public function testJustCountry(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('United States')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('United States'); $column = new CensusColumnBirthPlaceSimple($census, '', ''); @@ -64,10 +64,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase public function testKnownState(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Maryland, United States')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('United States'); $column = new CensusColumnBirthPlaceSimple($census, '', ''); @@ -77,10 +77,10 @@ class CensusColumnBirthPlaceSimpleTest extends TestCase public function testKnownStateAndTown(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('United States'); $column = new CensusColumnBirthPlaceSimple($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php index dc82f38233..f2cd717ae0 100644 --- a/tests/app/Census/CensusColumnBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnBirthPlaceTest.php @@ -30,7 +30,7 @@ class CensusColumnBirthPlaceTest extends TestCase { private function getPlaceMock(string $place): Place { - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); return $placeMock; @@ -38,10 +38,10 @@ class CensusColumnBirthPlaceTest extends TestCase public function testPlaceCountry(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Westminster, London, England')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBirthPlace($census, '', ''); @@ -51,10 +51,10 @@ class CensusColumnBirthPlaceTest extends TestCase public function testPlaceAndCountry(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('England')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBirthPlace($census, '', ''); @@ -64,10 +64,10 @@ class CensusColumnBirthPlaceTest extends TestCase public function testDifferentCountry(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Paris, France')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBirthPlace($census, '', ''); diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php index f3b2e145f8..3db80eb047 100644 --- a/tests/app/Census/CensusColumnBirthYearTest.php +++ b/tests/app/Census/CensusColumnBirthYearTest.php @@ -31,16 +31,16 @@ class CensusColumnBirthYearTest extends TestCase { public function testGenerateColumn(): void { - $cal_date = $this->createStub(GregorianDate::class); + $cal_date = self::createStub(GregorianDate::class); $cal_date->method('format')->willReturn('1800'); - $date = $this->createStub(Date::class); + $date = self::createStub(Date::class); $date->method('minimumDate')->willReturn($cal_date); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getEstimatedBirthDate')->willReturn($date); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1832'); $column = new CensusColumnBirthYear($census, '', ''); diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php index 17acc9d5ea..4f7e3620f4 100644 --- a/tests/app/Census/CensusColumnBornForeignPartsTest.php +++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php @@ -33,7 +33,7 @@ class CensusColumnBornForeignPartsTest extends TestCase { $placeParts = explode(', ', $place); - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); $placeMock->method('lastParts')->willReturn((new Collection($placeParts))->slice(-1)); @@ -42,10 +42,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornEnglandCensusEngland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -55,10 +55,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornWalesCensusEngland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -68,10 +68,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornScotlandCensusEngland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -81,10 +81,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornIrelandCensusEngland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -94,10 +94,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornForeignCensusEngland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -107,10 +107,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornEnglandCensusIreland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -120,10 +120,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornWalesCensusIreland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -133,10 +133,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornScotlandCensusIreland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -146,10 +146,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornIrelandCensusIreland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -159,10 +159,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornForeignCensusIreland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -172,10 +172,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornEnglandCensusScotland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Scotland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -185,10 +185,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornWalesCensusScotland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Scotland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -198,10 +198,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornScotlandCensusScotland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Scotland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -211,10 +211,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornIrelandCensusScotland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Scotland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -224,10 +224,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornForeignCensusScotland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Scotland'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -237,10 +237,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornEnglandCensusWales(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Wales'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -250,10 +250,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornWalesCensusWales(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Cardiff, Wales')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Wales'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -263,10 +263,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornScotlandCensusWales(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Edinburgh, Scotland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Wales'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -276,10 +276,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornIrelandCensusWales(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Dublin, Ireland')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Wales'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -289,10 +289,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornForeignCensusWales(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Elbonia')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Wales'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -302,10 +302,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornNowhereCensusEngland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -315,10 +315,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornNowhereCensusWales(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Wales'); $column = new CensusColumnBornForeignParts($census, '', ''); @@ -328,10 +328,10 @@ class CensusColumnBornForeignPartsTest extends TestCase public function testBornNowhereCensusScotland(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Scotland'); $column = new CensusColumnBornForeignParts($census, '', ''); diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php index e12be7d92d..29b33405db 100644 --- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php +++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php @@ -32,11 +32,11 @@ class CensusColumnChildrenBornAliveTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnChildrenBornAlive($census, '', ''); @@ -46,26 +46,26 @@ class CensusColumnChildrenBornAliveTest extends TestCase public function testCountChildren(): void { // Stillborn - $child1 = $this->createStub(Individual::class); + $child1 = self::createStub(Individual::class); $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904')); $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904')); // Died after census - $child2 = $this->createStub(Individual::class); + $child2 = self::createStub(Individual::class); $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904')); $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912')); // Died before census - $child3 = $this->createStub(Individual::class); + $child3 = self::createStub(Individual::class); $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904')); $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910')); // Still living - $child4 = $this->createStub(Individual::class); + $child4 = self::createStub(Individual::class); $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904')); $child4->method('getDeathDate')->willReturn(new Date('')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('children')->willReturn(new Collection([ $child1, $child2, @@ -73,11 +73,11 @@ class CensusColumnChildrenBornAliveTest extends TestCase $child4, ])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 MAR 1911'); $column = new CensusColumnChildrenBornAlive($census, '', ''); diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php index a5c0403f90..2d3bede611 100644 --- a/tests/app/Census/CensusColumnChildrenDiedTest.php +++ b/tests/app/Census/CensusColumnChildrenDiedTest.php @@ -32,11 +32,11 @@ class CensusColumnChildrenDiedTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnChildrenDied($census, '', ''); @@ -46,33 +46,33 @@ class CensusColumnChildrenDiedTest extends TestCase public function testCountChildren(): void { // Stillborn - $child1 = $this->createStub(Individual::class); + $child1 = self::createStub(Individual::class); $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904')); $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904')); // Died after census - $child2 = $this->createStub(Individual::class); + $child2 = self::createStub(Individual::class); $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904')); $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912')); // Died before census - $child3 = $this->createStub(Individual::class); + $child3 = self::createStub(Individual::class); $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904')); $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910')); // Still living - $child4 = $this->createStub(Individual::class); + $child4 = self::createStub(Individual::class); $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904')); $child4->method('getDeathDate')->willReturn(new Date('')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('children')->willReturn(new Collection([$child1, $child2, $child3, $child4])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 MAR 1911'); $column = new CensusColumnChildrenDied($census, '', ''); diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php index 4cb0220214..53e89928d8 100644 --- a/tests/app/Census/CensusColumnChildrenLivingTest.php +++ b/tests/app/Census/CensusColumnChildrenLivingTest.php @@ -32,11 +32,11 @@ class CensusColumnChildrenLivingTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnChildrenLiving($census, '', ''); @@ -46,26 +46,26 @@ class CensusColumnChildrenLivingTest extends TestCase public function testCountChildren(): void { // Stillborn - $child1 = $this->createStub(Individual::class); + $child1 = self::createStub(Individual::class); $child1->method('getBirthDate')->willReturn(new Date('01 FEB 1904')); $child1->method('getDeathDate')->willReturn(new Date('01 FEB 1904')); // Died after census - $child2 = $this->createStub(Individual::class); + $child2 = self::createStub(Individual::class); $child2->method('getBirthDate')->willReturn(new Date('02 FEB 1904')); $child2->method('getDeathDate')->willReturn(new Date('20 DEC 1912')); // Died before census - $child3 = $this->createStub(Individual::class); + $child3 = self::createStub(Individual::class); $child3->method('getBirthDate')->willReturn(new Date('02 FEB 1904')); $child3->method('getDeathDate')->willReturn(new Date('20 DEC 1910')); // Still living - $child4 = $this->createStub(Individual::class); + $child4 = self::createStub(Individual::class); $child4->method('getBirthDate')->willReturn(new Date('01 FEB 1904')); $child4->method('getDeathDate')->willReturn(new Date('')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('children')->willReturn(new Collection([ $child1, $child2, @@ -73,11 +73,11 @@ class CensusColumnChildrenLivingTest extends TestCase $child4, ])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 MAR 1911'); $column = new CensusColumnChildrenLiving($census, '', ''); diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php index 49ff3adfae..02f63a5d35 100644 --- a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php +++ b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -148,11 +148,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -162,16 +162,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); @@ -181,16 +181,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); @@ -200,16 +200,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); @@ -219,16 +219,16 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); @@ -238,7 +238,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -251,11 +251,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -265,7 +265,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -278,11 +278,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -292,7 +292,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testMarriedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -305,11 +305,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -319,7 +319,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase public function testMarriedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -332,11 +332,11 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedSingle($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php index 572b7768aa..aa4301dd20 100644 --- a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php +++ b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -148,11 +148,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -162,16 +162,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); @@ -181,16 +181,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); @@ -200,16 +200,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); @@ -219,16 +219,16 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); @@ -238,7 +238,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -251,11 +251,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -265,7 +265,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -278,11 +278,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -292,7 +292,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testMarriedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -305,11 +305,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -319,7 +319,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase public function testMarriedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -332,11 +332,11 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaMarriedWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionCanadaTest.php b/tests/app/Census/CensusColumnConditionCanadaTest.php index dd319beed8..61e4dc3fc4 100644 --- a/tests/app/Census/CensusColumnConditionCanadaTest.php +++ b/tests/app/Census/CensusColumnConditionCanadaTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionCanadaTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanada($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionCanadaTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanada($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionCanadaTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionCanadaTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionCanadaTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionCanadaTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionCanadaTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -148,11 +148,11 @@ class CensusColumnConditionCanadaTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -162,16 +162,16 @@ class CensusColumnConditionCanadaTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanada($census, '', ''); @@ -181,16 +181,16 @@ class CensusColumnConditionCanadaTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanada($census, '', ''); @@ -200,16 +200,16 @@ class CensusColumnConditionCanadaTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanada($census, '', ''); @@ -219,16 +219,16 @@ class CensusColumnConditionCanadaTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanada($census, '', ''); @@ -238,7 +238,7 @@ class CensusColumnConditionCanadaTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -251,11 +251,11 @@ class CensusColumnConditionCanadaTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -265,7 +265,7 @@ class CensusColumnConditionCanadaTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -278,11 +278,11 @@ class CensusColumnConditionCanadaTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -292,7 +292,7 @@ class CensusColumnConditionCanadaTest extends TestCase public function testMarriedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -305,11 +305,11 @@ class CensusColumnConditionCanadaTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -319,7 +319,7 @@ class CensusColumnConditionCanadaTest extends TestCase public function testMarriedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -332,11 +332,11 @@ class CensusColumnConditionCanadaTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanada($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php index 522ff3318e..b50cbd3d50 100644 --- a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php +++ b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -148,11 +148,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -162,16 +162,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); @@ -181,16 +181,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); @@ -200,16 +200,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); @@ -219,16 +219,16 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); @@ -238,7 +238,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -251,11 +251,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -265,7 +265,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -278,11 +278,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -292,7 +292,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testMarriedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -305,11 +305,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -319,7 +319,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase public function testMarriedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -332,11 +332,11 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedFemale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php index 38eedaad31..4a53d23d0b 100644 --- a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php +++ b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -148,11 +148,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -162,16 +162,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); @@ -181,16 +181,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); @@ -200,16 +200,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); @@ -219,16 +219,16 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); @@ -238,7 +238,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -251,11 +251,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -265,7 +265,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -278,11 +278,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -292,7 +292,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testMarriedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -305,11 +305,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -319,7 +319,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase public function testMarriedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -332,11 +332,11 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowedMale($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php index 1e799117f3..6801fcdf25 100644 --- a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php +++ b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -148,11 +148,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -162,16 +162,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); @@ -181,16 +181,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); @@ -200,16 +200,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); @@ -219,16 +219,16 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); @@ -238,7 +238,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -251,11 +251,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -265,7 +265,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -278,11 +278,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -292,7 +292,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testMarriedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -305,11 +305,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -319,7 +319,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase public function testMarriedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -332,11 +332,11 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionCanadaWidowed($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php index c4279bddec..a03d3ea227 100644 --- a/tests/app/Census/CensusColumnConditionDanishTest.php +++ b/tests/app/Census/CensusColumnConditionDanishTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionDanishTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionDanish($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionDanishTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionDanish($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionDanishTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionDanish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionDanishTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionDanish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionDanishTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionDanishTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionDanish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionDanishTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -147,11 +147,11 @@ class CensusColumnConditionDanishTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionDanish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -161,16 +161,16 @@ class CensusColumnConditionDanishTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionDanish($census, '', ''); @@ -180,16 +180,16 @@ class CensusColumnConditionDanishTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionDanish($census, '', ''); @@ -199,16 +199,16 @@ class CensusColumnConditionDanishTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionDanish($census, '', ''); @@ -218,16 +218,16 @@ class CensusColumnConditionDanishTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionDanish($census, '', ''); @@ -237,7 +237,7 @@ class CensusColumnConditionDanishTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -249,11 +249,11 @@ class CensusColumnConditionDanishTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionDanish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -263,7 +263,7 @@ class CensusColumnConditionDanishTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -275,11 +275,11 @@ class CensusColumnConditionDanishTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionDanish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php index 2c8bcfef7d..4823a29e7b 100644 --- a/tests/app/Census/CensusColumnConditionEnglishTest.php +++ b/tests/app/Census/CensusColumnConditionEnglishTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionEnglishTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionEnglish($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionEnglishTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionEnglish($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionEnglishTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionEnglish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionEnglishTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionEnglish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionEnglishTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionEnglishTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionEnglish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionEnglishTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -147,11 +147,11 @@ class CensusColumnConditionEnglishTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionEnglish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -161,16 +161,16 @@ class CensusColumnConditionEnglishTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionEnglish($census, '', ''); @@ -180,16 +180,16 @@ class CensusColumnConditionEnglishTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionEnglish($census, '', ''); @@ -199,16 +199,16 @@ class CensusColumnConditionEnglishTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionEnglish($census, '', ''); @@ -218,16 +218,16 @@ class CensusColumnConditionEnglishTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionEnglish($census, '', ''); @@ -237,7 +237,7 @@ class CensusColumnConditionEnglishTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -249,11 +249,11 @@ class CensusColumnConditionEnglishTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionEnglish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -263,7 +263,7 @@ class CensusColumnConditionEnglishTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -275,11 +275,11 @@ class CensusColumnConditionEnglishTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionEnglish($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php index 304f621e4b..f93fdf831a 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFemme($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFemme($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -147,11 +147,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -161,16 +161,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFemme($census, '', ''); @@ -180,16 +180,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFemme($census, '', ''); @@ -199,16 +199,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFemme($census, '', ''); @@ -218,16 +218,16 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFemme($census, '', ''); @@ -237,7 +237,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -249,11 +249,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -275,11 +275,11 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php index 554ada6c97..222c7bc336 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFille($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFille($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -147,11 +147,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -161,16 +161,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFille($census, '', ''); @@ -180,16 +180,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFille($census, '', ''); @@ -199,16 +199,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFille($census, '', ''); @@ -218,16 +218,16 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchFille($census, '', ''); @@ -237,7 +237,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -249,11 +249,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -275,11 +275,11 @@ class CensusColumnConditionFrenchFilleTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php index e783d6c8a8..10dee7a903 100644 --- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -147,11 +147,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -161,16 +161,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); @@ -180,16 +180,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); @@ -199,16 +199,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); @@ -218,16 +218,16 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); @@ -237,7 +237,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -249,11 +249,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -275,11 +275,11 @@ class CensusColumnConditionFrenchGarconTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php index af89c4331e..307033de17 100644 --- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchHomme($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchHomme($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -147,11 +147,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -161,16 +161,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchHomme($census, '', ''); @@ -180,16 +180,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchHomme($census, '', ''); @@ -199,16 +199,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchHomme($census, '', ''); @@ -218,16 +218,16 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchHomme($census, '', ''); @@ -237,7 +237,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -249,11 +249,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -275,11 +275,11 @@ class CensusColumnConditionFrenchHommeTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php index 365161588d..b19c9eeca1 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -147,11 +147,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -161,16 +161,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); @@ -180,16 +180,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); @@ -199,16 +199,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); @@ -218,16 +218,16 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); @@ -237,7 +237,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -249,11 +249,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family @@ -275,11 +275,11 @@ class CensusColumnConditionFrenchVeufTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php index 28b9d21cd7..1f88b6e910 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -118,11 +118,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -132,9 +132,9 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -149,11 +149,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -163,16 +163,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); @@ -182,16 +182,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); @@ -201,16 +201,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); @@ -220,16 +220,16 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); @@ -239,7 +239,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -252,11 +252,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -266,7 +266,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -279,11 +279,11 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php index fca7b5578d..eb871a1276 100644 --- a/tests/app/Census/CensusColumnConditionUsTest.php +++ b/tests/app/Census/CensusColumnConditionUsTest.php @@ -33,12 +33,12 @@ class CensusColumnConditionUsTest extends TestCase { public function testNoSpouseFamiliesMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionUs($census, '', ''); @@ -48,12 +48,12 @@ class CensusColumnConditionUsTest extends TestCase public function testNoSpouseFamiliesFemale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection()); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionUs($census, '', ''); @@ -63,16 +63,16 @@ class CensusColumnConditionUsTest extends TestCase public function testNoFamilyFactsMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -82,16 +82,16 @@ class CensusColumnConditionUsTest extends TestCase public function testNoFamilyFactsFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -101,9 +101,9 @@ class CensusColumnConditionUsTest extends TestCase public function testSpouseDeadMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -117,11 +117,11 @@ class CensusColumnConditionUsTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -131,9 +131,9 @@ class CensusColumnConditionUsTest extends TestCase public function testSpouseDeadFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getDeathDate')->willReturn(new Date('1820')); $family = $this->createMock(Family::class); @@ -148,11 +148,11 @@ class CensusColumnConditionUsTest extends TestCase ); $family->expects($this->once())->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -162,16 +162,16 @@ class CensusColumnConditionUsTest extends TestCase public function testNoFamilyUnmarriedMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionUs($census, '', ''); @@ -181,16 +181,16 @@ class CensusColumnConditionUsTest extends TestCase public function testNoFamilyUnmarriedFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionUs($census, '', ''); @@ -200,16 +200,16 @@ class CensusColumnConditionUsTest extends TestCase public function testChildMale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionUs($census, '', ''); @@ -219,16 +219,16 @@ class CensusColumnConditionUsTest extends TestCase public function testChildFemale(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('getMarriageDate')->willReturn(new Date('')); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('30 JUN 1830'); $column = new CensusColumnConditionUs($census, '', ''); @@ -238,7 +238,7 @@ class CensusColumnConditionUsTest extends TestCase public function testDivorcedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -251,11 +251,11 @@ class CensusColumnConditionUsTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -265,7 +265,7 @@ class CensusColumnConditionUsTest extends TestCase public function testDivorcedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -278,11 +278,11 @@ class CensusColumnConditionUsTest extends TestCase new Collection([$fact]) ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -292,7 +292,7 @@ class CensusColumnConditionUsTest extends TestCase public function testMarriedMale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -305,11 +305,11 @@ class CensusColumnConditionUsTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); @@ -319,7 +319,7 @@ class CensusColumnConditionUsTest extends TestCase public function testMarriedFemale(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $family = $this->createMock(Family::class); $family->expects($this->once())->method('getMarriageDate')->willReturn(new Date('')); @@ -332,11 +332,11 @@ class CensusColumnConditionUsTest extends TestCase new Collection() ); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnConditionUs($census, '', ''); $census->method('censusDate')->willReturn('30 JUN 1830'); diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php index 5f0de7b10e..957a968187 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php @@ -34,7 +34,7 @@ class CensusColumnFatherBirthPlaceSimpleTest extends TestCase { $placeParts = explode(', ', $place); - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); $placeMock->method('lastParts')->willReturn(new Collection($placeParts)); @@ -43,16 +43,16 @@ class CensusColumnFatherBirthPlaceSimpleTest extends TestCase public function testKnownStateAndTown(): void { - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('husband')->willReturn($father); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('United States'); $column = new CensusColumnFatherBirthPlaceSimple($census, '', ''); diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php index 4179833f6d..cf4e943c74 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php @@ -34,7 +34,7 @@ class CensusColumnFatherBirthPlaceTest extends TestCase { $placeParts = explode(', ', $place); - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); $placeMock->method('lastParts')->willReturn(new Collection($placeParts)); @@ -43,16 +43,16 @@ class CensusColumnFatherBirthPlaceTest extends TestCase public function testSameCountry(): void { - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('husband')->willReturn($father); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnFatherBirthPlace($census, '', ''); @@ -62,16 +62,16 @@ class CensusColumnFatherBirthPlaceTest extends TestCase public function testDifferentCountry(): void { - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('husband')->willReturn($father); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnFatherBirthPlace($census, '', ''); @@ -81,13 +81,13 @@ class CensusColumnFatherBirthPlaceTest extends TestCase public function testPlaceNoParent(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('husband')->willReturn(null); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnFatherBirthPlace($census, '', ''); @@ -97,10 +97,10 @@ class CensusColumnFatherBirthPlaceTest extends TestCase public function testPlaceNoParentFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnFatherBirthPlace($census, '', ''); diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php index d2f2b0e410..b2245f26ce 100644 --- a/tests/app/Census/CensusColumnFatherForeignTest.php +++ b/tests/app/Census/CensusColumnFatherForeignTest.php @@ -32,7 +32,7 @@ class CensusColumnFatherForeignTest extends TestCase { private function getPlaceMock(string $place): Place { - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); return $placeMock; @@ -40,16 +40,16 @@ class CensusColumnFatherForeignTest extends TestCase public function testSameCountry(): void { - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('husband')->willReturn($father); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnFatherForeign($census, '', ''); @@ -59,16 +59,16 @@ class CensusColumnFatherForeignTest extends TestCase public function testDifferentCountry(): void { - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('husband')->willReturn($father); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnFatherForeign($census, '', ''); @@ -78,13 +78,13 @@ class CensusColumnFatherForeignTest extends TestCase public function testPlaceNoParent(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('husband')->willReturn(null); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnFatherForeign($census, '', ''); @@ -94,10 +94,10 @@ class CensusColumnFatherForeignTest extends TestCase public function testPlaceNoParentFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnFatherForeign($census, '', ''); diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php index 2dd11a96c5..72ab684492 100644 --- a/tests/app/Census/CensusColumnFullNameTest.php +++ b/tests/app/Census/CensusColumnFullNameTest.php @@ -33,11 +33,11 @@ class CensusColumnFullNameTest extends TestCase { public function xxxtestFullName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([['full' => 'Joe Bloggs']]); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn(''); $column = new CensusColumnFullName($census, '', ''); @@ -58,22 +58,22 @@ class CensusColumnFullNameTest extends TestCase $marriage_date = new Date('02 DATE 2019'); - $marriage = $this->createStub(Fact::class); + $marriage = self::createStub(Fact::class); $marriage->method('date')->willReturn($marriage_date); - $spouse = $this->createStub(Individual::class); + $spouse = self::createStub(Individual::class); $spouse->method('getAllNames')->willReturn($husband_names); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->willReturn(new Collection([$marriage])); $family->method('getMarriageDate')->willReturn($marriage_date); $family->method('spouse')->willReturn($spouse); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn($wife_names); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JAN 2020'); $column = new CensusColumnFullName($census, '', ''); diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php index 348dcf03a9..b9e1499149 100644 --- a/tests/app/Census/CensusColumnGivenNameInitialTest.php +++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php @@ -29,10 +29,10 @@ class CensusColumnGivenNameInitialTest extends TestCase { public function testOneGivenName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([['givn' => 'Joe']]); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnGivenNameInitial($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnGivenNameInitialTest extends TestCase public function testMultipleGivenNames(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([['givn' => 'Joe Fred']]); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnGivenNameInitial($census, '', ''); @@ -53,10 +53,10 @@ class CensusColumnGivenNameInitialTest extends TestCase public function testNoName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([]); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnGivenNameInitial($census, '', ''); diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php index 0a0ce39654..555fdbd16a 100644 --- a/tests/app/Census/CensusColumnGivenNamesTest.php +++ b/tests/app/Census/CensusColumnGivenNamesTest.php @@ -29,10 +29,10 @@ class CensusColumnGivenNamesTest extends TestCase { public function testGivenNames(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([['givn' => 'Joe']]); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnGivenNames($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnGivenNamesTest extends TestCase public function testNoName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([]); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnGivenNames($census, '', ''); diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php index 1213d948a7..8c5df46191 100644 --- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php @@ -33,16 +33,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase { public function testMarriedWithinYear(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('01 DEC 1859')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMarriedWithinYear($census, '', ''); @@ -52,16 +52,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase public function testMarriedOverYearBeforeTheCensus(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('01 JAN 1859')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMarriedWithinYear($census, '', ''); @@ -71,16 +71,16 @@ class CensusColumnMarriedWithinYearTest extends TestCase public function testMarriedAfterTheCensus(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('02 JUN 1860')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMarriedWithinYear($census, '', ''); @@ -90,13 +90,13 @@ class CensusColumnMarriedWithinYearTest extends TestCase public function testNoMarriage(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMarriedWithinYear($census, '', ''); @@ -106,10 +106,10 @@ class CensusColumnMarriedWithinYearTest extends TestCase public function testNoSpouseFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMarriedWithinYear($census, '', ''); diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php index 708ead4450..2bc82b12de 100644 --- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php @@ -30,10 +30,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase { public function testBornWithinYear(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('01 JAN 1860')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); @@ -43,10 +43,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase public function testBornOverYearBeforeTheCensus(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('01 JAN 1859')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); @@ -56,10 +56,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase public function testBornAfterTheCensus(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('02 JUN 1860')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); @@ -69,10 +69,10 @@ class CensusColumnMonthIfBornWithinYearTest extends TestCase public function testNoBirth(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthDate')->willReturn(new Date('')); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php index be09c851d5..bfcdd24b59 100644 --- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php @@ -33,16 +33,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase { public function testMarriedWithinYear(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('01 DEC 1859')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); @@ -52,16 +52,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase public function testMarriedOverYearBeforeTheCensus(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('01 JAN 1859')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); @@ -71,16 +71,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase public function testMarriedAfterTheCensus(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('02 JUN 1860')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); @@ -90,13 +90,13 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase public function testNoMarriage(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'])->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); @@ -106,10 +106,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends TestCase public function testNoSpouseFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php index e38dd601d0..30b4d9b197 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php @@ -34,7 +34,7 @@ class CensusColumnMotherBirthPlaceSimpleTest extends TestCase { $placeParts = explode(', ', $place); - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); $placeMock->method('lastParts')->willReturn(new Collection($placeParts)); @@ -43,16 +43,16 @@ class CensusColumnMotherBirthPlaceSimpleTest extends TestCase public function testKnownStateAndTown(): void { - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('getBirthPlace')->willReturn($this->getPlaceMock('Miami, Florida, United States')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('wife')->willReturn($father); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('United States'); $column = new CensusColumnMotherBirthPlaceSimple($census, '', ''); diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php index 3acdda1775..6a39546e21 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php @@ -34,7 +34,7 @@ class CensusColumnMotherBirthPlaceTest extends TestCase { $placeParts = explode(', ', $place); - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); $placeMock->method('lastParts')->willReturn(new Collection($placeParts)); @@ -43,16 +43,16 @@ class CensusColumnMotherBirthPlaceTest extends TestCase public function testSameCountry(): void { - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('wife')->willReturn($mother); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnMotherBirthPlace($census, '', ''); @@ -62,16 +62,16 @@ class CensusColumnMotherBirthPlaceTest extends TestCase public function testDifferentCountry(): void { - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('wife')->willReturn($mother); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnMotherBirthPlace($census, '', ''); @@ -81,13 +81,13 @@ class CensusColumnMotherBirthPlaceTest extends TestCase public function testPlaceNoParent(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('wife')->willReturn(null); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnMotherBirthPlace($census, '', ''); @@ -97,10 +97,10 @@ class CensusColumnMotherBirthPlaceTest extends TestCase public function testPlaceNoParentFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnMotherBirthPlace($census, '', ''); diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php index c6afac0f00..0c2fadfa25 100644 --- a/tests/app/Census/CensusColumnMotherForeignTest.php +++ b/tests/app/Census/CensusColumnMotherForeignTest.php @@ -32,7 +32,7 @@ class CensusColumnMotherForeignTest extends TestCase { private function getPlaceMock(string $place): Place { - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); return $placeMock; @@ -40,16 +40,16 @@ class CensusColumnMotherForeignTest extends TestCase public function testSameCountry(): void { - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('wife')->willReturn($mother); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnMotherForeign($census, '', ''); @@ -59,16 +59,16 @@ class CensusColumnMotherForeignTest extends TestCase public function testDifferentCountry(): void { - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('wife')->willReturn($mother); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Ireland'); $column = new CensusColumnMotherForeign($census, '', ''); @@ -78,13 +78,13 @@ class CensusColumnMotherForeignTest extends TestCase public function testPlaceNoParent(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('wife')->willReturn(null); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnMotherForeign($census, '', ''); @@ -94,10 +94,10 @@ class CensusColumnMotherForeignTest extends TestCase public function testPlaceNoParentFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('childFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnMotherForeign($census, '', ''); diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php index ae2e6212a3..b73f3520d9 100644 --- a/tests/app/Census/CensusColumnNationalityTest.php +++ b/tests/app/Census/CensusColumnNationalityTest.php @@ -33,7 +33,7 @@ class CensusColumnNationalityTest extends TestCase { private function getPlaceMock(string $place): Place { - $placeMock = $this->createStub(Place::class); + $placeMock = self::createStub(Place::class); $placeMock->method('gedcomName')->willReturn($place); return $placeMock; @@ -41,11 +41,11 @@ class CensusColumnNationalityTest extends TestCase public function testNoBirthPlace(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('')); $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('Deutschland'); $column = new CensusColumnNationality($census, '', ''); @@ -55,11 +55,11 @@ class CensusColumnNationalityTest extends TestCase public function testPlaceCountry(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('Australia')); $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnNationality($census, '', ''); @@ -69,11 +69,11 @@ class CensusColumnNationalityTest extends TestCase public function testBritish(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $column = new CensusColumnNationality($census, '', ''); @@ -83,28 +83,28 @@ class CensusColumnNationalityTest extends TestCase public function testEmigrated(): void { - $place1 = $this->createStub(Place::class); + $place1 = self::createStub(Place::class); $place1->method('gedcomName')->willReturn('United States'); - $fact1 = $this->createStub(Fact::class); + $fact1 = self::createStub(Fact::class); $fact1->method('place')->willReturn($place1); $fact1->method('date')->willReturn(new Date('1855')); - $place2 = $this->createStub(Place::class); + $place2 = self::createStub(Place::class); $place2->method('gedcomName')->willReturn('Australia'); - $fact2 = $this->createStub(Fact::class); + $fact2 = self::createStub(Fact::class); $fact2->method('place')->willReturn($place2); $fact2->method('date')->willReturn(new Date('1865')); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getBirthPlace')->willReturn($this->getPlaceMock('London, England')); $individual->method('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->willReturn(new Collection([ $fact1, $fact2, ])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusPlace')->willReturn('England'); $census->method('censusDate')->willReturn('01 JUN 1860'); diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php index 3322b7dcc8..b2929a04b0 100644 --- a/tests/app/Census/CensusColumnNullTest.php +++ b/tests/app/Census/CensusColumnNullTest.php @@ -29,9 +29,9 @@ class CensusColumnNullTest extends TestCase { public function testNull(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnNull($census, '', ''); diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php index f9077535f9..168194a175 100644 --- a/tests/app/Census/CensusColumnOccupationTest.php +++ b/tests/app/Census/CensusColumnOccupationTest.php @@ -31,10 +31,10 @@ class CensusColumnOccupationTest extends TestCase { public function testNoOccupation(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->with(['OCCU'])->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnOccupation($census, '', ''); @@ -43,13 +43,13 @@ class CensusColumnOccupationTest extends TestCase public function testOccupation(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Farmer'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->with(['OCCU'])->willReturn(new Collection([$fact])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnOccupation($census, '', ''); diff --git a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php index 616b5ce4cc..c91b59e87a 100644 --- a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php @@ -30,9 +30,9 @@ class CensusColumnRelationToHeadEnglishTest extends TestCase { public function testNull(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnRelationToHeadEnglish($census, '', ''); diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php index f16ecab5d7..e366b30713 100644 --- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php @@ -30,9 +30,9 @@ class CensusColumnRelationToHeadGermanTest extends TestCase { public function testNull(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnRelationToHeadGerman($census, '', ''); diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php index 28bc219121..cdc5f4c130 100644 --- a/tests/app/Census/CensusColumnRelationToHeadTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadTest.php @@ -32,15 +32,15 @@ class CensusColumnRelationToHeadTest extends TestCase public function testNull(): void { - $individual1 = $this->createStub(Individual::class); - $individual2 = $this->createStub(Individual::class); + $individual1 = self::createStub(Individual::class); + $individual2 = self::createStub(Individual::class); $individual1->method('childFamilies')->willReturn(new Collection()); $individual1->method('spouseFamilies')->willReturn(new Collection()); $individual2->method('childFamilies')->willReturn(new Collection()); $individual2->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnRelationToHead($census, '', ''); diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php index 61f50f04b6..da62dc70ac 100644 --- a/tests/app/Census/CensusColumnReligionTest.php +++ b/tests/app/Census/CensusColumnReligionTest.php @@ -38,7 +38,7 @@ class CensusColumnReligionTest extends TestCase ->with(self::withConsecutive([['RELI'], []])) ->willReturnOnConsecutiveCalls(new Collection(), new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnReligion($census, '', ''); @@ -47,12 +47,12 @@ class CensusColumnReligionTest extends TestCase public function testRecordReligion(): void { - $individual = $this->createStub(Individual::class); - $fact = $this->createStub(Fact::class); + $individual = self::createStub(Individual::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Jedi'); $individual->method('facts')->with(['RELI'])->willReturn(new Collection([$fact])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnReligion($census, '', ''); @@ -62,7 +62,7 @@ class CensusColumnReligionTest extends TestCase public function testEventReligion(): void { $individual = $this->createMock(Individual::class); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('attribute')->with('RELI')->willReturn('Jedi'); $individual ->expects($this->exactly(2)) @@ -73,7 +73,7 @@ class CensusColumnReligionTest extends TestCase new Collection([$fact]) ); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnReligion($census, '', ''); diff --git a/tests/app/Census/CensusColumnSexFTest.php b/tests/app/Census/CensusColumnSexFTest.php index a415d7b5ac..4d05159eae 100644 --- a/tests/app/Census/CensusColumnSexFTest.php +++ b/tests/app/Census/CensusColumnSexFTest.php @@ -29,10 +29,10 @@ class CensusColumnSexFTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexF($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnSexFTest extends TestCase public function testFeale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexF($census, '', ''); @@ -53,10 +53,10 @@ class CensusColumnSexFTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexF($census, '', ''); diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php index a55987e743..450357c5fc 100644 --- a/tests/app/Census/CensusColumnSexMFTest.php +++ b/tests/app/Census/CensusColumnSexMFTest.php @@ -29,10 +29,10 @@ class CensusColumnSexMFTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMF($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnSexMFTest extends TestCase public function testFeale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMF($census, '', ''); @@ -53,10 +53,10 @@ class CensusColumnSexMFTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMF($census, '', ''); diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php index 2c478990c8..55a21e2d8d 100644 --- a/tests/app/Census/CensusColumnSexMKTest.php +++ b/tests/app/Census/CensusColumnSexMKTest.php @@ -29,10 +29,10 @@ class CensusColumnSexMKTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMK($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnSexMKTest extends TestCase public function testFeale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMK($census, '', ''); @@ -53,10 +53,10 @@ class CensusColumnSexMKTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMK($census, '', ''); diff --git a/tests/app/Census/CensusColumnSexMTest.php b/tests/app/Census/CensusColumnSexMTest.php index 262d8b71f6..83a8a34e3b 100644 --- a/tests/app/Census/CensusColumnSexMTest.php +++ b/tests/app/Census/CensusColumnSexMTest.php @@ -29,10 +29,10 @@ class CensusColumnSexMTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexM($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnSexMTest extends TestCase public function testFeale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexM($census, '', ''); @@ -53,10 +53,10 @@ class CensusColumnSexMTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexM($census, '', ''); diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php index c649ccc668..ad776f30ff 100644 --- a/tests/app/Census/CensusColumnSexMZTest.php +++ b/tests/app/Census/CensusColumnSexMZTest.php @@ -29,10 +29,10 @@ class CensusColumnSexMZTest extends TestCase { public function testMale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('M'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMZ($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnSexMZTest extends TestCase public function testFeale(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('F'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMZ($census, '', ''); @@ -53,10 +53,10 @@ class CensusColumnSexMZTest extends TestCase public function testUnknownSex(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('sex')->willReturn('U'); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSexMZ($census, '', ''); diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php index 189fa44f2d..777acb032d 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php @@ -30,7 +30,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase { public function testOneGivenName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([ [ 'givn' => 'Joe', @@ -39,7 +39,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase ]); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn(''); $column = new CensusColumnSurnameGivenNameInitial($census, '', ''); @@ -49,7 +49,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase public function testMultipleGivenNames(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([ [ 'givn' => 'Joe Fred', @@ -58,7 +58,7 @@ class CensusColumnSurnameGivenNameInitialTest extends TestCase ]); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn(''); $column = new CensusColumnSurnameGivenNameInitial($census, '', ''); diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php index b231d7080e..ac10d2d744 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php @@ -30,7 +30,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase { public function testOneGivenName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([ [ 'givn' => 'Joe', @@ -39,7 +39,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase ]); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn(''); $column = new CensusColumnSurnameGivenNames($census, '', ''); @@ -49,7 +49,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase public function testMultipleGivenNames(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([ [ 'givn' => 'Joe Fred', @@ -58,7 +58,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase ]); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn(''); $column = new CensusColumnSurnameGivenNames($census, '', ''); @@ -68,7 +68,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase public function testNoName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([ [ 'givn' => Individual::PRAENOMEN_NESCIO, @@ -77,7 +77,7 @@ class CensusColumnSurnameGivenNamesTest extends TestCase ]); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn(''); $column = new CensusColumnSurnameGivenNames($census, '', ''); diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php index baa2ca1848..111b6c44b7 100644 --- a/tests/app/Census/CensusColumnSurnameTest.php +++ b/tests/app/Census/CensusColumnSurnameTest.php @@ -29,10 +29,10 @@ class CensusColumnSurnameTest extends TestCase { public function testSurname(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([['surname' => 'Bloggs']]); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSurname($census, '', ''); @@ -41,10 +41,10 @@ class CensusColumnSurnameTest extends TestCase public function testNoName(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('getAllNames')->willReturn([]); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $column = new CensusColumnSurname($census, '', ''); diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php index 6132ff58b7..5807f9d93d 100644 --- a/tests/app/Census/CensusColumnYearsMarriedTest.php +++ b/tests/app/Census/CensusColumnYearsMarriedTest.php @@ -33,10 +33,10 @@ class CensusColumnYearsMarriedTest extends TestCase { public function testNoSpouseFamily(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection()); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnYearsMarried($census, '', ''); @@ -46,13 +46,13 @@ class CensusColumnYearsMarriedTest extends TestCase public function testNoMarriage(): void { - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'], true)->willReturn(new Collection()); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnYearsMarried($census, '', ''); @@ -62,16 +62,16 @@ class CensusColumnYearsMarriedTest extends TestCase public function testUndatedMarriage(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnYearsMarried($census, '', ''); @@ -81,16 +81,16 @@ class CensusColumnYearsMarriedTest extends TestCase public function testMarriageAfterCensus(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('1861')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnYearsMarried($census, '', ''); @@ -100,16 +100,16 @@ class CensusColumnYearsMarriedTest extends TestCase public function testMarriageBeforeCensus(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('date')->willReturn(new Date('OCT 1851')); - $family = $this->createStub(Family::class); + $family = self::createStub(Family::class); $family->method('facts')->with(['MARR'], true)->willReturn(new Collection([$fact])); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('spouseFamilies')->willReturn(new Collection([$family])); - $census = $this->createStub(CensusInterface::class); + $census = self::createStub(CensusInterface::class); $census->method('censusDate')->willReturn('01 JUN 1860'); $column = new CensusColumnYearsMarried($census, '', ''); diff --git a/tests/app/DefaultUserTest.php b/tests/app/DefaultUserTest.php index 2328440d0a..f093a6979d 100644 --- a/tests/app/DefaultUserTest.php +++ b/tests/app/DefaultUserTest.php @@ -32,7 +32,7 @@ class DefaultUserTest extends TestCase { parent::setUp(); - $cache_factory = $this->createStub(CacheFactoryInterface::class); + $cache_factory = self::createStub(CacheFactoryInterface::class); $cache_factory->method('array')->willReturn(new Cache(new NullAdapter())); Registry::cache($cache_factory); } diff --git a/tests/app/Elements/AbstractElementTestCase.php b/tests/app/Elements/AbstractElementTestCase.php index ed7802ab78..65c0673694 100644 --- a/tests/app/Elements/AbstractElementTestCase.php +++ b/tests/app/Elements/AbstractElementTestCase.php @@ -48,7 +48,7 @@ abstract class AbstractElementTestCase extends TestCase public function testXssInValue(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $html = static::$element->value(self::EVIL_VALUE, $tree); $message = 'XSS vulnerability in value()'; @@ -57,7 +57,7 @@ abstract class AbstractElementTestCase extends TestCase public function testXssInLabelValue(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $html = static::$element->labelValue(self::EVIL_VALUE, $tree); $message = 'XSS vulnerability in labelValue()'; @@ -66,7 +66,7 @@ abstract class AbstractElementTestCase extends TestCase public function testXssInEdit(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $html = static::$element->edit('id', 'name', self::EVIL_VALUE, $tree); $message = 'XSS vulnerability in edit()'; @@ -75,7 +75,7 @@ abstract class AbstractElementTestCase extends TestCase public function testValidHtmlInValue(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $html = static::$element->value(self::TEST_VALUE, $tree); $this->validateHtml($html); @@ -83,7 +83,7 @@ abstract class AbstractElementTestCase extends TestCase public function testValidHtmlInEdit(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $html = static::$element->edit('id', 'name', self::TEST_VALUE, $tree); $this->validateHtml($html); diff --git a/tests/app/Elements/AgeAtEventTest.php b/tests/app/Elements/AgeAtEventTest.php index f569b34a2d..fadf0c89c7 100644 --- a/tests/app/Elements/AgeAtEventTest.php +++ b/tests/app/Elements/AgeAtEventTest.php @@ -44,7 +44,7 @@ class AgeAtEventTest extends AbstractElementTestCase public function testValue(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('child', self::$element->value('cHiLd', $tree)); self::assertSame('infant', self::$element->value('iNfAnT ', $tree)); diff --git a/tests/app/Elements/XrefFamilyTest.php b/tests/app/Elements/XrefFamilyTest.php index bc6d146da3..4ab2809768 100644 --- a/tests/app/Elements/XrefFamilyTest.php +++ b/tests/app/Elements/XrefFamilyTest.php @@ -37,7 +37,7 @@ class XrefFamilyTest extends TestCase { $element = new XrefFamily(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(FamilyFactory::class); @@ -85,7 +85,7 @@ class XrefFamilyTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(FamilyFactory::class); @@ -102,7 +102,7 @@ class XrefFamilyTest extends TestCase { $element = new XrefFamily(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -111,7 +111,7 @@ class XrefFamilyTest extends TestCase { $element = new XrefFamily(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(FamilyFactory::class); diff --git a/tests/app/Elements/XrefIndividualTest.php b/tests/app/Elements/XrefIndividualTest.php index a371be8ace..856f41c354 100644 --- a/tests/app/Elements/XrefIndividualTest.php +++ b/tests/app/Elements/XrefIndividualTest.php @@ -37,7 +37,7 @@ class XrefIndividualTest extends TestCase { $element = new XrefIndividual(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(IndividualFactory::class); @@ -85,7 +85,7 @@ class XrefIndividualTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(IndividualFactory::class); @@ -102,7 +102,7 @@ class XrefIndividualTest extends TestCase { $element = new XrefIndividual(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -111,7 +111,7 @@ class XrefIndividualTest extends TestCase { $element = new XrefIndividual(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(IndividualFactory::class); diff --git a/tests/app/Elements/XrefLocationTest.php b/tests/app/Elements/XrefLocationTest.php index 0c9a5a039e..48ce98e45c 100644 --- a/tests/app/Elements/XrefLocationTest.php +++ b/tests/app/Elements/XrefLocationTest.php @@ -37,7 +37,7 @@ class XrefLocationTest extends TestCase { $element = new XrefLocation(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(LocationFactory::class); @@ -85,7 +85,7 @@ class XrefLocationTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(LocationFactory::class); @@ -102,7 +102,7 @@ class XrefLocationTest extends TestCase { $element = new XrefLocation(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -111,7 +111,7 @@ class XrefLocationTest extends TestCase { $element = new XrefLocation(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(LocationFactory::class); diff --git a/tests/app/Elements/XrefMediaTest.php b/tests/app/Elements/XrefMediaTest.php index 24b99f4846..8774e771f1 100644 --- a/tests/app/Elements/XrefMediaTest.php +++ b/tests/app/Elements/XrefMediaTest.php @@ -37,7 +37,7 @@ class XrefMediaTest extends TestCase { $element = new XrefMedia(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(MediaFactory::class); @@ -84,7 +84,7 @@ class XrefMediaTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(MediaFactory::class); @@ -101,7 +101,7 @@ class XrefMediaTest extends TestCase { $element = new XrefMedia(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -110,7 +110,7 @@ class XrefMediaTest extends TestCase { $element = new XrefMedia(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(MediaFactory::class); diff --git a/tests/app/Elements/XrefNoteTest.php b/tests/app/Elements/XrefNoteTest.php index fb086a481f..0098a6f6da 100644 --- a/tests/app/Elements/XrefNoteTest.php +++ b/tests/app/Elements/XrefNoteTest.php @@ -36,7 +36,7 @@ class XrefNoteTest extends TestCase { $element = new XrefNote(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(NoteFactory::class); @@ -79,7 +79,7 @@ class XrefNoteTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(NoteFactory::class); @@ -96,7 +96,7 @@ class XrefNoteTest extends TestCase { $element = new XrefNote(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -105,7 +105,7 @@ class XrefNoteTest extends TestCase { $element = new XrefNote(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(NoteFactory::class); diff --git a/tests/app/Elements/XrefRepositoryTest.php b/tests/app/Elements/XrefRepositoryTest.php index a565002e2a..42e7149d4e 100644 --- a/tests/app/Elements/XrefRepositoryTest.php +++ b/tests/app/Elements/XrefRepositoryTest.php @@ -37,7 +37,7 @@ class XrefRepositoryTest extends TestCase { $element = new XrefRepository(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(RepositoryFactory::class); @@ -84,7 +84,7 @@ class XrefRepositoryTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(RepositoryFactory::class); @@ -101,7 +101,7 @@ class XrefRepositoryTest extends TestCase { $element = new XrefRepository(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -110,7 +110,7 @@ class XrefRepositoryTest extends TestCase { $element = new XrefRepository(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(RepositoryFactory::class); diff --git a/tests/app/Elements/XrefSharedNoteTest.php b/tests/app/Elements/XrefSharedNoteTest.php index f44d2b2cdc..6af4e20478 100644 --- a/tests/app/Elements/XrefSharedNoteTest.php +++ b/tests/app/Elements/XrefSharedNoteTest.php @@ -36,7 +36,7 @@ class XrefSharedNoteTest extends TestCase { $element = new XrefSharedNote(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SharedNoteFactory::class); @@ -79,7 +79,7 @@ class XrefSharedNoteTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SharedNoteFactory::class); @@ -96,7 +96,7 @@ class XrefSharedNoteTest extends TestCase { $element = new XrefSharedNote(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -105,7 +105,7 @@ class XrefSharedNoteTest extends TestCase { $element = new XrefSharedNote(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SharedNoteFactory::class); diff --git a/tests/app/Elements/XrefSourceTest.php b/tests/app/Elements/XrefSourceTest.php index 4a2daba3b6..35adbdd048 100644 --- a/tests/app/Elements/XrefSourceTest.php +++ b/tests/app/Elements/XrefSourceTest.php @@ -39,7 +39,7 @@ class XrefSourceTest extends TestCase { $element = new XrefSource(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SourceFactory::class); @@ -70,7 +70,7 @@ class XrefSourceTest extends TestCase { $element = new XrefSource(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $request = self::createRequest(); @@ -105,7 +105,7 @@ class XrefSourceTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SourceFactory::class); @@ -122,7 +122,7 @@ class XrefSourceTest extends TestCase { $element = new XrefSource(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">@invalid@</span>', $element->value('@invalid@', $tree)); } @@ -131,7 +131,7 @@ class XrefSourceTest extends TestCase { $element = new XrefSource(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<p>invalid</p>', $element->value('invalid', $tree)); } @@ -140,7 +140,7 @@ class XrefSourceTest extends TestCase { $element = new XrefSource(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SourceFactory::class); diff --git a/tests/app/Elements/XrefSubmissionTest.php b/tests/app/Elements/XrefSubmissionTest.php index 41cc8e19bf..a34337bc4e 100644 --- a/tests/app/Elements/XrefSubmissionTest.php +++ b/tests/app/Elements/XrefSubmissionTest.php @@ -37,7 +37,7 @@ class XrefSubmissionTest extends TestCase { $element = new XrefSubmission(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SubmissionFactory::class); @@ -84,7 +84,7 @@ class XrefSubmissionTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SubmissionFactory::class); @@ -101,7 +101,7 @@ class XrefSubmissionTest extends TestCase { $element = new XrefSubmission(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -110,7 +110,7 @@ class XrefSubmissionTest extends TestCase { $element = new XrefSubmission(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SubmissionFactory::class); diff --git a/tests/app/Elements/XrefSubmitterTest.php b/tests/app/Elements/XrefSubmitterTest.php index 92473d4dec..6ea37c7b32 100644 --- a/tests/app/Elements/XrefSubmitterTest.php +++ b/tests/app/Elements/XrefSubmitterTest.php @@ -37,7 +37,7 @@ class XrefSubmitterTest extends TestCase { $element = new XrefSubmitter(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SubmitterFactory::class); @@ -84,7 +84,7 @@ class XrefSubmitterTest extends TestCase ->method('url') ->willReturn('https://url'); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SubmitterFactory::class); @@ -101,7 +101,7 @@ class XrefSubmitterTest extends TestCase { $element = new XrefSubmitter(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame('<span class="error">invalid</span>', $element->value('invalid', $tree)); } @@ -110,7 +110,7 @@ class XrefSubmitterTest extends TestCase { $element = new XrefSubmitter(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = $this->createMock(SubmitterFactory::class); diff --git a/tests/app/FactTest.php b/tests/app/FactTest.php index 0e218c1ad3..7cd020a547 100644 --- a/tests/app/FactTest.php +++ b/tests/app/FactTest.php @@ -28,7 +28,7 @@ class FactTest extends TestCase public function testAttribute(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('tag')->willReturn('INDI'); $fact = new Fact("1 BIRT\n2 ADDR address", $individual, ''); @@ -43,7 +43,7 @@ class FactTest extends TestCase */ public function testIssue4417(): void { - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('tag')->willReturn('INDI'); $fact = new Fact("1 BIRT\n2 PLACXYZ\n3 CONT place", $individual, ''); diff --git a/tests/app/Factories/MarkdownFactoryTest.php b/tests/app/Factories/MarkdownFactoryTest.php index 9ca452c3dd..f59a13379d 100644 --- a/tests/app/Factories/MarkdownFactoryTest.php +++ b/tests/app/Factories/MarkdownFactoryTest.php @@ -41,7 +41,7 @@ class MarkdownFactoryTest extends TestCase public function testAutoLinkWithTree(): void { $factory = new MarkdownFactory(); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); self::assertSame( '<p>FOO <a href="https://example.com">https://example.com</a> BAR</p>', @@ -76,7 +76,7 @@ class MarkdownFactoryTest extends TestCase public function testMarkdownWithTree(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $factory = new MarkdownFactory(); self::assertSame( diff --git a/tests/app/GedcomRecordTest.php b/tests/app/GedcomRecordTest.php index a01377394f..3bf86b0ee1 100644 --- a/tests/app/GedcomRecordTest.php +++ b/tests/app/GedcomRecordTest.php @@ -68,18 +68,18 @@ class GedcomRecordTest extends TestCase $facts = $individual->facts(['FACT']); - $this->assertCount(4, $facts); + self::assertCount(4, $facts); $individual->createFact('1 FACT baz', false, $facts[2]); $facts = $individual->facts(['FACT']); - $this->assertCount(5, $facts); - $this->assertSame('1 FACT foo', $facts[0]->gedcom()); - $this->assertSame('1 FACT foo', $facts[1]->gedcom()); - $this->assertSame('1 FACT baz', $facts[2]->gedcom()); - $this->assertSame('1 FACT bar', $facts[3]->gedcom()); - $this->assertSame('1 FACT bar', $facts[4]->gedcom()); + self::assertCount(5, $facts); + self::assertSame('1 FACT foo', $facts[0]->gedcom()); + self::assertSame('1 FACT foo', $facts[1]->gedcom()); + self::assertSame('1 FACT baz', $facts[2]->gedcom()); + self::assertSame('1 FACT bar', $facts[3]->gedcom()); + self::assertSame('1 FACT bar', $facts[4]->gedcom()); } public function createFactWithInvalidData(): void @@ -105,10 +105,10 @@ class GedcomRecordTest extends TestCase $facts = $individual->facts(['FACT']); - $this->assertCount(3, $facts); - $this->assertSame('1 FACT foo', $facts[0]->gedcom()); - $this->assertSame('1 FACT foo', $facts[1]->gedcom()); - $this->assertSame('1 FACT bar', $facts[2]->gedcom()); + self::assertCount(3, $facts); + self::assertSame('1 FACT foo', $facts[0]->gedcom()); + self::assertSame('1 FACT foo', $facts[1]->gedcom()); + self::assertSame('1 FACT bar', $facts[2]->gedcom()); } public function testUpdateFact(): void @@ -126,11 +126,11 @@ class GedcomRecordTest extends TestCase $facts = $individual->facts(['FACT']); - $this->assertCount(4, $facts); - $this->assertSame('1 FACT foo', $facts[0]->gedcom()); - $this->assertSame('1 FACT foo', $facts[1]->gedcom()); - $this->assertSame('1 FACT baz', $facts[2]->gedcom()); - $this->assertSame('1 FACT bar', $facts[3]->gedcom()); + self::assertCount(4, $facts); + self::assertSame('1 FACT foo', $facts[0]->gedcom()); + self::assertSame('1 FACT foo', $facts[1]->gedcom()); + self::assertSame('1 FACT baz', $facts[2]->gedcom()); + self::assertSame('1 FACT bar', $facts[3]->gedcom()); } public function updateFactWithInvalidData(): void diff --git a/tests/app/Http/Middleware/AuthAdministratorTest.php b/tests/app/Http/Middleware/AuthAdministratorTest.php index 8aec9f1c54..4cb5fdb267 100644 --- a/tests/app/Http/Middleware/AuthAdministratorTest.php +++ b/tests/app/Http/Middleware/AuthAdministratorTest.php @@ -35,10 +35,10 @@ class AuthAdministratorTest extends TestCase { public function testAllowed(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn('1'); $request = self::createRequest()->withAttribute('user', $user); @@ -54,10 +54,10 @@ class AuthAdministratorTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); $request = self::createRequest()->withAttribute('user', $user); @@ -68,7 +68,7 @@ class AuthAdministratorTest extends TestCase public function testNotLoggedIn(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); $request = self::createRequest()->withAttribute('user', new GuestUser()); diff --git a/tests/app/Http/Middleware/AuthEditorTest.php b/tests/app/Http/Middleware/AuthEditorTest.php index 61ee4c4e60..e2ddd45356 100644 --- a/tests/app/Http/Middleware/AuthEditorTest.php +++ b/tests/app/Http/Middleware/AuthEditorTest.php @@ -36,13 +36,13 @@ class AuthEditorTest extends TestCase { public function testAllowed(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_EDITOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -58,13 +58,13 @@ class AuthEditorTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MEMBER); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -75,10 +75,10 @@ class AuthEditorTest extends TestCase public function testNotLoggedIn(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthEditor(); diff --git a/tests/app/Http/Middleware/AuthManagerTest.php b/tests/app/Http/Middleware/AuthManagerTest.php index 08609b6b6c..c14c2bf800 100644 --- a/tests/app/Http/Middleware/AuthManagerTest.php +++ b/tests/app/Http/Middleware/AuthManagerTest.php @@ -36,13 +36,13 @@ class AuthManagerTest extends TestCase { public function testAllowed(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MANAGER); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -58,13 +58,13 @@ class AuthManagerTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MODERATOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -75,10 +75,10 @@ class AuthManagerTest extends TestCase public function testNotLoggedIn(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthManager(); diff --git a/tests/app/Http/Middleware/AuthMemberTest.php b/tests/app/Http/Middleware/AuthMemberTest.php index 014f70a104..0129329f1c 100644 --- a/tests/app/Http/Middleware/AuthMemberTest.php +++ b/tests/app/Http/Middleware/AuthMemberTest.php @@ -36,13 +36,13 @@ class AuthMemberTest extends TestCase { public function testAllowed(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MEMBER); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -58,13 +58,13 @@ class AuthMemberTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(''); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -75,10 +75,10 @@ class AuthMemberTest extends TestCase public function testNotLoggedIn(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthMember(); diff --git a/tests/app/Http/Middleware/AuthModeratorTest.php b/tests/app/Http/Middleware/AuthModeratorTest.php index b4690cf881..af536ac35a 100644 --- a/tests/app/Http/Middleware/AuthModeratorTest.php +++ b/tests/app/Http/Middleware/AuthModeratorTest.php @@ -36,13 +36,13 @@ class AuthModeratorTest extends TestCase { public function testAllowed(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_MODERATOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -58,13 +58,13 @@ class AuthModeratorTest extends TestCase $this->expectException(HttpAccessDeniedException::class); $this->expectExceptionMessage('You do not have permission to view this page.'); - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $user = $this->createStub(User::class); + $user = self::createStub(User::class); $user->method('getPreference')->with(UserInterface::PREF_IS_ADMINISTRATOR)->willReturn(''); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree->method('getUserPreference')->with($user, UserInterface::PREF_TREE_ROLE)->willReturn(UserInterface::ROLE_EDITOR); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', $user); @@ -75,10 +75,10 @@ class AuthModeratorTest extends TestCase public function testNotLoggedIn(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('lorem ipsum')); - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $request = self::createRequest()->withAttribute('tree', $tree)->withAttribute('user', new GuestUser()); $middleware = new AuthModerator(); diff --git a/tests/app/Http/Middleware/BootModulesTest.php b/tests/app/Http/Middleware/BootModulesTest.php index 3acbe9f261..5ee5f8ca4a 100644 --- a/tests/app/Http/Middleware/BootModulesTest.php +++ b/tests/app/Http/Middleware/BootModulesTest.php @@ -35,7 +35,7 @@ class BootModulesTest extends TestCase { $theme = new WebtreesTheme(); - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response('It works!')); $module_service = $this->createMock(ModuleService::class); diff --git a/tests/app/Http/Middleware/CheckCsrfTest.php b/tests/app/Http/Middleware/CheckCsrfTest.php index 0a90f96335..db78581983 100644 --- a/tests/app/Http/Middleware/CheckCsrfTest.php +++ b/tests/app/Http/Middleware/CheckCsrfTest.php @@ -34,7 +34,7 @@ class CheckCsrfTest extends TestCase { public function testMiddleware(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); $uri_factory = Registry::container()->get(UriFactoryInterface::class); diff --git a/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php b/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php index b54736a9db..adeec6e07c 100644 --- a/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php +++ b/tests/app/Http/Middleware/CheckForMaintenanceModeTest.php @@ -32,10 +32,10 @@ class CheckForMaintenanceModeTest extends TestCase { public function testSiteIsOffline(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); - $maintenance_mode_service = $this->createStub(MaintenanceModeService::class); + $maintenance_mode_service = self::createStub(MaintenanceModeService::class); $maintenance_mode_service->method('isOffline')->willReturn(true); $maintenance_mode_service->method('message')->willReturn('XYZZY'); @@ -49,10 +49,10 @@ class CheckForMaintenanceModeTest extends TestCase public function testSiteIsOnline(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); - $maintenance_mode_service = $this->createStub(MaintenanceModeService::class); + $maintenance_mode_service = self::createStub(MaintenanceModeService::class); $maintenance_mode_service->method('isOffline')->willReturn(false); $request = self::createRequest(); diff --git a/tests/app/Http/Middleware/DoHousekeepingTest.php b/tests/app/Http/Middleware/DoHousekeepingTest.php index 6a9a8159e8..b54f266155 100644 --- a/tests/app/Http/Middleware/DoHousekeepingTest.php +++ b/tests/app/Http/Middleware/DoHousekeepingTest.php @@ -34,7 +34,7 @@ class DoHousekeepingTest extends TestCase public function testMiddleware(): void { - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willReturn(response()); $request = self::createRequest(); diff --git a/tests/app/Http/Middleware/HandleExceptionsTest.php b/tests/app/Http/Middleware/HandleExceptionsTest.php index 2701d42ec8..7a436d987a 100644 --- a/tests/app/Http/Middleware/HandleExceptionsTest.php +++ b/tests/app/Http/Middleware/HandleExceptionsTest.php @@ -37,12 +37,12 @@ class HandleExceptionsTest extends TestCase public function testMiddleware(): void { - $tree_service = $this->createStub(TreeService::class); + $tree_service = self::createStub(TreeService::class); - $handler = $this->createStub(RequestHandlerInterface::class); + $handler = self::createStub(RequestHandlerInterface::class); $handler->method('handle')->willThrowException(new HttpServerErrorException('eek')); - $module_service = $this->createStub(ModuleService::class); + $module_service = self::createStub(ModuleService::class); $module_service->method('findByInterface')->willReturn(new Collection()); $module_service->method('findByComponent')->willReturn(new Collection()); Registry::container()->set(ModuleService::class, $module_service); diff --git a/tests/app/Http/RequestHandlers/AccountDeleteTest.php b/tests/app/Http/RequestHandlers/AccountDeleteTest.php index 8e4723aa24..3fa6f1f7aa 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->createStub(UserService::class); + $user_service = self::createStub(UserService::class); $request = self::createRequest(); diff --git a/tests/app/Http/RequestHandlers/AccountEditTest.php b/tests/app/Http/RequestHandlers/AccountEditTest.php index 07f0e397f2..5789b52868 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->createStub(User::class); - $message_service = $this->createStub(MessageService::class); - $module_service = $this->createStub(ModuleService::class); + $user = self::createStub(User::class); + $message_service = self::createStub(MessageService::class); + $module_service = self::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 4881992057..2df2b5592a 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->createStub(UserService::class); + $user_service = self::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 53185153da..0d341a7d94 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->createStub(MessageService::class); + $message_service = self::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->createStub(MessageService::class); + $message_service = self::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 c891a2a4dc..f410bb0c5a 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->createStub(User::class); + $user = self::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 c1c06a8533..c059c53bb4 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->createStub(User::class); + $user = self::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 e64e09ee8d..54fbe4be1e 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->createStub(MediaFileService::class); + $media_file_service = self::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->createStub(MediaFileService::class); + $media_file_service = self::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->createStub(MediaFileService::class); + $media_file_service = self::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 add27f3919..4b64eb005b 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->createStub(User::class); + $user1 = self::createStub(User::class); $user1->method('id')->willReturn(1); - $user2 = $this->createStub(User::class); + $user2 = self::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->createStub(User::class); + $user = self::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->createStub(User::class); + $user = self::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 91b0b20ddc..767ca64c9f 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->createStub(User::class); + $user = self::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 13882cb6af..c763eb43ae 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->createStub(User::class); + $user = self::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 44ad244010..897bb66b43 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -122,7 +122,7 @@ class RedirectAncestryPhpTest extends TestCase ->method('all') ->willReturn(new Collection([])); - $module_service = $this->createStub(ModuleService::class); + $module_service = self::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 50fac52563..fbb87ab233 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -83,7 +83,7 @@ class RedirectBranchesPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 62232b4fc3..d0957f519b 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->createStub(Tree::class); + $tree = self::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 289948931b..5aac815137 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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 dd002d8996..e90a76c87e 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(ModuleService::class); + $module_service = self::createStub(ModuleService::class); $module_service ->method('findByComponent') ->with(ModuleChartInterface::class) ->willReturn(new Collection()); - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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 6ad4ce47c1..c74583bf57 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectFamListPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -103,7 +103,7 @@ class RedirectFamListPhpTest extends TestCase public function testNoSuchTree(): void { - $module_service = $this->createStub(ModuleService::class); + $module_service = self::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 b6b251a01f..31227c016b 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(ModuleService::class); + $module_service = self::createStub(ModuleService::class); $module_service ->method('findByComponent') ->with(ModuleChartInterface::class) ->willReturn(new Collection()); - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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 ff7f6ba661..9d9fe29c37 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->createStub(Tree::class); + $tree = self::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->createStub(Family::class); + $family = self::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->createStub(Tree::class); + $tree = self::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->createStub(TreeService::class); + $tree_service = self::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 c1c659305b..76ce7d6595 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -122,7 +122,7 @@ class RedirectFanChartPhpTest extends TestCase ->method('all') ->willReturn(new Collection([])); - $module_service = $this->createStub(ModuleService::class); + $module_service = self::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 cec768bdc3..41aac4ba4f 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->createStub(Tree::class); + $tree = self::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->createStub(GedcomRecord::class); + $gedcom_record = self::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->createStub(Tree::class); + $tree = self::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->createStub(TreeService::class); + $tree_service = self::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 336ad424f8..66e1f24095 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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 093d4f77b9..071f4b81e7 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectIndiListPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 1c312532e6..cfc41a520e 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(TreeService::class); + $tree_service = self::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 5ef703b194..b6e169dc75 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -80,7 +80,7 @@ class RedirectLifeSpanPhpTest extends TestCase ->with(ModuleChartInterface::class) ->willReturn(new Collection()); - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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 2e356cbba5..d99972353f 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectMediaListPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 1e79870881..20d85bffbd 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->createStub(Tree::class); + $tree = self::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->createStub(Media::class); + $media = self::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->createStub(Tree::class); + $tree = self::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->createStub(TreeService::class); + $tree_service = self::createStub(TreeService::class); $handler = new RedirectFamilyPhp($tree_service); @@ -125,7 +125,7 @@ class RedirectMediaViewerPhpTest extends TestCase public function testMissingXrefParameter(): void { - $tree_service = $this->createStub(TreeService::class); + $tree_service = self::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 fe254c5e01..69bd2c76cb 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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 0221f637bc..b17f9e3770 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectNoteListPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 78c191206d..a5d83898b2 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->createStub(Tree::class); + $tree = self::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->createStub(Note::class); + $note = self::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->createStub(Tree::class); + $tree = self::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->createStub(TreeService::class); + $tree_service = self::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 0933a795e5..3c1a423121 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 b9d873937a..7f9d88e289 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectPlaceListPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 7b69cb94e2..4aa9b21b3d 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 20320a357e..7d4538db04 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectRepoListPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 f9353dd67a..2e5f5a95d5 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->createStub(Tree::class); + $tree = self::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 d9850ae278..58a62ce5bd 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->createStub(Tree::class); + $tree = self::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->createStub(Repository::class); + $repository = self::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->createStub(Tree::class); + $tree = self::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->createStub(TreeService::class); + $tree_service = self::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 f9b460f0eb..fb74f273d1 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectSourceListPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 b6f33217f9..335e49b746 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->createStub(Tree::class); + $tree = self::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->createStub(Source::class); + $source = self::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->createStub(Tree::class); + $tree = self::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->createStub(TreeService::class); + $tree_service = self::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 e6edfe85ad..685743c095 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->createStub(Tree::class); + $tree = self::createStub(Tree::class); $tree ->method('name') ->willReturn('tree1'); @@ -75,7 +75,7 @@ class RedirectStatisticsPhpTest extends TestCase public function testModuleDisabled(): void { - $tree = $this->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 aee2ee7f60..951121386b 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->createStub(Tree::class); + $tree = self::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->createStub(Individual::class); + $individual = self::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->createStub(Tree::class); + $tree = self::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->createStub(ModuleService::class); + $module_service = self::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->createStub(ModuleService::class); + $module_service = self::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 38baf9cdb2..4501d13a79 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->createStub(Builder::class); + $query = self::createStub(Builder::class); - $site_logs_service = $this->createStub(SiteLogsService::class); + $site_logs_service = self::createStub(SiteLogsService::class); $site_logs_service->method('logsQuery')->willReturn($query); - $response = $this->createStub(ResponseInterface::class); + $response = self::createStub(ResponseInterface::class); $response->method('getStatusCode')->willReturn(StatusCodeInterface::STATUS_OK); - $data_tables_service = $this->createStub(DatatablesService::class); + $data_tables_service = self::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 851c9b6a67..a7b33782a2 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->createStub(Builder::class); + $query = self::createStub(Builder::class); $query->method('delete'); - $site_logs_service = $this->createStub(SiteLogsService::class); + $site_logs_service = self::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 94119edec9..594fd69f93 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->createStub(Builder::class); - $query2 = $this->createStub(Builder::class); - $rows1 = $this->createStub(Collection::class); - $rows2 = $this->createStub(Collection::class); + $query1 = self::createStub(Builder::class); + $query2 = self::createStub(Builder::class); + $rows1 = self::createStub(Collection::class); + $rows2 = self::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->createStub(SiteLogsService::class); + $site_logs_service = self::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 5f89fa4c91..696f87aa61 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->createStub(TreeService::class); + $tree_service = self::createStub(TreeService::class); $tree_service->method('all')->willReturn(new Collection()); - $user_service = $this->createStub(UserService::class); + $user_service = self::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 6cfb8d0578..9134e860d2 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->createStub(UpgradeService::class); + $mock_upgrade_service = self::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->createStub(UpgradeService::class); + $mock_upgrade_service = self::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->createStub(UpgradeService::class); + $mock_upgrade_service = self::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->createStub(TreeService::class); + $tree_service = self::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->createStub(UpgradeService::class); + $mock_upgrade_service = self::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->createStub(UpgradeService::class); + $mock_upgrade_service = self::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->createStub(UpgradeService::class); + $mock_upgrade_service = self::createStub(UpgradeService::class); $mock_upgrade_service->method('webtreesZipContents')->willReturn(new Collection()); $handler = new UpgradeWizardStep( new GedcomExportService(new Psr17Factory(), new Psr17Factory()), diff --git a/tests/app/Module/AustrianHistoricEventsTest.php b/tests/app/Module/AustrianHistoricEventsTest.php index dc84c1a2ee..f5fcbfcb7e 100644 --- a/tests/app/Module/AustrianHistoricEventsTest.php +++ b/tests/app/Module/AustrianHistoricEventsTest.php @@ -31,7 +31,7 @@ class AustrianHistoricEventsTest extends TestCase { $module = new AustrianHistoricEvents(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('de') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/AustrianPresidentsTest.php b/tests/app/Module/AustrianPresidentsTest.php index 0ecad4ee39..afee0cf6f7 100644 --- a/tests/app/Module/AustrianPresidentsTest.php +++ b/tests/app/Module/AustrianPresidentsTest.php @@ -31,7 +31,7 @@ class AustrianPresidentsTest extends TestCase { $module = new AustrianPresidents(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('de') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/BritishMonarchsTest.php b/tests/app/Module/BritishMonarchsTest.php index 8749c8b87c..a2181ce7cc 100644 --- a/tests/app/Module/BritishMonarchsTest.php +++ b/tests/app/Module/BritishMonarchsTest.php @@ -31,7 +31,7 @@ class BritishMonarchsTest extends TestCase { $module = new BritishMonarchs(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('en-GB') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/BritishPrimeMinistersTest.php b/tests/app/Module/BritishPrimeMinistersTest.php index cd6e5617f1..134cde594b 100644 --- a/tests/app/Module/BritishPrimeMinistersTest.php +++ b/tests/app/Module/BritishPrimeMinistersTest.php @@ -31,7 +31,7 @@ class BritishPrimeMinistersTest extends TestCase { $module = new BritishPrimeMinisters(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('en-GB') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/BritishSocialHistoryTest.php b/tests/app/Module/BritishSocialHistoryTest.php index c4f61cddb8..ddb9b83986 100644 --- a/tests/app/Module/BritishSocialHistoryTest.php +++ b/tests/app/Module/BritishSocialHistoryTest.php @@ -31,7 +31,7 @@ class BritishSocialHistoryTest extends TestCase { $module = new BritishSocialHistory(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('en-GB') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/CzechMonarchsAndPresidentsTest.php b/tests/app/Module/CzechMonarchsAndPresidentsTest.php index 65c5e4abb7..0918847036 100644 --- a/tests/app/Module/CzechMonarchsAndPresidentsTest.php +++ b/tests/app/Module/CzechMonarchsAndPresidentsTest.php @@ -31,7 +31,7 @@ class CzechMonarchsAndPresidentsTest extends TestCase { $module = new CzechMonarchsAndPresidents(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('cs') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/DutchMonarchsTest.php b/tests/app/Module/DutchMonarchsTest.php index f4b8053494..9725364300 100644 --- a/tests/app/Module/DutchMonarchsTest.php +++ b/tests/app/Module/DutchMonarchsTest.php @@ -31,7 +31,7 @@ class DutchMonarchsTest extends TestCase { $module = new DutchMonarchs(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('nl') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/DutchPrimeMinistersTest.php b/tests/app/Module/DutchPrimeMinistersTest.php index 89f501f692..0d382e6997 100644 --- a/tests/app/Module/DutchPrimeMinistersTest.php +++ b/tests/app/Module/DutchPrimeMinistersTest.php @@ -31,7 +31,7 @@ class DutchPrimeMinistersTest extends TestCase { $module = new DutchPrimeMinisters(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('nl') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/FrenchHistoryTest.php b/tests/app/Module/FrenchHistoryTest.php index a5a701d13e..bbfe0e2c11 100644 --- a/tests/app/Module/FrenchHistoryTest.php +++ b/tests/app/Module/FrenchHistoryTest.php @@ -31,7 +31,7 @@ class FrenchHistoryTest extends TestCase { $module = new FrenchHistory(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('fr') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/LowCountriesRulersTest.php b/tests/app/Module/LowCountriesRulersTest.php index 40766d0e36..687d225b03 100644 --- a/tests/app/Module/LowCountriesRulersTest.php +++ b/tests/app/Module/LowCountriesRulersTest.php @@ -31,7 +31,7 @@ class LowCountriesRulersTest extends TestCase { $module = new LowCountriesRulers(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('nl') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/MapLinkBingTest.php b/tests/app/Module/MapLinkBingTest.php index bc2b3f4670..ce66c8fc0b 100644 --- a/tests/app/Module/MapLinkBingTest.php +++ b/tests/app/Module/MapLinkBingTest.php @@ -32,7 +32,7 @@ class MapLinkBingTest extends TestCase { $module = new MapLinkBing(); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('latitude')->willReturn(null); $fact->method('longitude')->willReturn(null); @@ -45,10 +45,10 @@ class MapLinkBingTest extends TestCase { $module = new MapLinkBing(); - $record = $this->createStub(Individual::class); + $record = self::createStub(Individual::class); $record->method('fullName')->willReturn('FULL NAME'); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('latitude')->willReturn(54.321); $fact->method('longitude')->willReturn(-1.2345); $fact->method('label')->willReturn('LABEL'); diff --git a/tests/app/Module/MapLinkGoogleTest.php b/tests/app/Module/MapLinkGoogleTest.php index d42ea51c64..44c5d7f4af 100644 --- a/tests/app/Module/MapLinkGoogleTest.php +++ b/tests/app/Module/MapLinkGoogleTest.php @@ -32,7 +32,7 @@ class MapLinkGoogleTest extends TestCase { $module = new MapLinkGoogle(); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('latitude')->willReturn(null); $fact->method('longitude')->willReturn(null); @@ -45,10 +45,10 @@ class MapLinkGoogleTest extends TestCase { $module = new MapLinkGoogle(); - $record = $this->createStub(Individual::class); + $record = self::createStub(Individual::class); $record->method('fullName')->willReturn('FULL NAME'); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('latitude')->willReturn(54.321); $fact->method('longitude')->willReturn(-1.2345); $fact->method('label')->willReturn('LABEL'); diff --git a/tests/app/Module/MapLinkOpenStreetMapTest.php b/tests/app/Module/MapLinkOpenStreetMapTest.php index 80d86b4bec..3f921e21e7 100644 --- a/tests/app/Module/MapLinkOpenStreetMapTest.php +++ b/tests/app/Module/MapLinkOpenStreetMapTest.php @@ -32,7 +32,7 @@ class MapLinkOpenStreetMapTest extends TestCase { $module = new MapLinkOpenStreetMap(); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('latitude')->willReturn(null); $fact->method('longitude')->willReturn(null); @@ -45,10 +45,10 @@ class MapLinkOpenStreetMapTest extends TestCase { $module = new MapLinkOpenStreetMap(); - $record = $this->createStub(Individual::class); + $record = self::createStub(Individual::class); $record->method('fullName')->willReturn('FULL NAME'); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('latitude')->willReturn(54.321); $fact->method('longitude')->willReturn(-1.2345); $fact->method('label')->willReturn('LABEL'); diff --git a/tests/app/Module/NewZealandPrimeMinistersTest.php b/tests/app/Module/NewZealandPrimeMinistersTest.php index 6d9f69befa..6f0f7d51b2 100644 --- a/tests/app/Module/NewZealandPrimeMinistersTest.php +++ b/tests/app/Module/NewZealandPrimeMinistersTest.php @@ -31,7 +31,7 @@ class NewZealandPrimeMinistersTest extends TestCase { $module = new NewZealandPrimeMinisters(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('en-AU') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/USPresidentsTest.php b/tests/app/Module/USPresidentsTest.php index 5ebcdf5e1a..fc4874d66e 100644 --- a/tests/app/Module/USPresidentsTest.php +++ b/tests/app/Module/USPresidentsTest.php @@ -31,7 +31,7 @@ class USPresidentsTest extends TestCase { $module = new USPresidents(); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); foreach ($module->historicEventsAll('en-US') as $gedcom) { $fact = new Fact($gedcom, $individual, 'test'); diff --git a/tests/app/Module/UpcomingAnniversariesModuleTest.php b/tests/app/Module/UpcomingAnniversariesModuleTest.php index 200ce184dc..64b0679376 100644 --- a/tests/app/Module/UpcomingAnniversariesModuleTest.php +++ b/tests/app/Module/UpcomingAnniversariesModuleTest.php @@ -28,7 +28,7 @@ class UpcomingAnniversariesModuleTest extends TestCase { public function testModuleProperties(): void { - $calendar_service = $this->createStub(CalendarService::class); + $calendar_service = self::createStub(CalendarService::class); $module = new UpcomingAnniversariesModule($calendar_service); diff --git a/tests/app/NoteTest.php b/tests/app/NoteTest.php index 38922510d7..f44d23200e 100644 --- a/tests/app/NoteTest.php +++ b/tests/app/NoteTest.php @@ -33,7 +33,7 @@ class NoteTest extends TestCase public function testNoteName(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $note = new Note('X123', "0 @X123@ NOTE 1\n1 CONT\n1 CONT 2\n1 CONT 3\n1 CONT 4", null, $tree); self::assertSame('<bdi>1</bdi>', $note->fullName()); @@ -41,7 +41,7 @@ class NoteTest extends TestCase public function testNoteNameWithHtmlEntities(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); $text = '"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt." "a quote"'; $note = new Note('X123', '0 @X123@ NOTE ' . $text, null, $tree); diff --git a/tests/app/Services/EmailServiceTest.php b/tests/app/Services/EmailServiceTest.php index 6f2aa37b9f..726fd010d6 100644 --- a/tests/app/Services/EmailServiceTest.php +++ b/tests/app/Services/EmailServiceTest.php @@ -36,16 +36,16 @@ class EmailServiceTest extends TestCase { $email_service = new EmailService(); - $user_from = $this->createStub(UserInterface::class); + $user_from = self::createStub(UserInterface::class); $user_from->method('email')->willReturn('user.from@example.com'); - $user_from = $this->createStub(UserInterface::class); + $user_from = self::createStub(UserInterface::class); $user_from->method('email')->willReturn('user.from@example.com'); - $user_to = $this->createStub(UserInterface::class); + $user_to = self::createStub(UserInterface::class); $user_to->method('email')->willReturn('user.to@example.com'); - $user_reply_to = $this->createStub(UserInterface::class); + $user_reply_to = self::createStub(UserInterface::class); $user_reply_to->method('email')->willReturn('user.replyto@example.com'); Site::setPreference('SMTP_ACTIVE', 'internal'); diff --git a/tests/app/Services/GedcomEditServiceTest.php b/tests/app/Services/GedcomEditServiceTest.php index 468e5d1181..2f48551938 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 = $this->createStub(Tree::class); + $tree = self::createStub(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 = $this->createStub(Tree::class); + $tree = self::createStub(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/Services/TimeoutServiceTest.php b/tests/app/Services/TimeoutServiceTest.php index 621727483a..cb6517d5a5 100644 --- a/tests/app/Services/TimeoutServiceTest.php +++ b/tests/app/Services/TimeoutServiceTest.php @@ -29,7 +29,7 @@ class TimeoutServiceTest extends TestCase { public function testNoTimeOut(): void { - $php_service = $this->createStub(PhpService::class); + $php_service = self::createStub(PhpService::class); $php_service->method('maxExecutionTime')->willReturn(0); $now = 1500000000.0; @@ -41,14 +41,14 @@ class TimeoutServiceTest extends TestCase public function testTimeOutReached(): void { - $php_service = $this->createStub(PhpService::class); + $php_service = self::createStub(PhpService::class); $php_service->method('maxExecutionTime')->willReturn(30); $now = 1500000000.0; $timeout_service = new TimeoutService($php_service, $now); - $time_factory = $this->createStub(TimeFactoryInterface::class); + $time_factory = self::createStub(TimeFactoryInterface::class); $time_factory->method('now')->willReturn($now + 60.0); Registry::timeFactory($time_factory); @@ -57,14 +57,14 @@ class TimeoutServiceTest extends TestCase public function testTimeOutNotReached(): void { - $php_service = $this->createStub(PhpService::class); + $php_service = self::createStub(PhpService::class); $php_service->method('maxExecutionTime')->willReturn(30); $now = Registry::timeFactory()->now(); $timeout_service = new TimeoutService($php_service, $now); - $time_factory = $this->createStub(TimeFactoryInterface::class); + $time_factory = self::createStub(TimeFactoryInterface::class); $time_factory->method('now')->willReturn($now + 10.0); Registry::timeFactory($time_factory); @@ -77,7 +77,7 @@ class TimeoutServiceTest extends TestCase $timeout_service = new TimeoutService(new PhpService(), $now); - $time_factory = $this->createStub(TimeFactoryInterface::class); + $time_factory = self::createStub(TimeFactoryInterface::class); $time_factory->method('now')->willReturn($now + 1.4); Registry::timeFactory($time_factory); @@ -90,7 +90,7 @@ class TimeoutServiceTest extends TestCase $timeout_service = new TimeoutService(new PhpService(), $now); - $time_factory = $this->createStub(TimeFactoryInterface::class); + $time_factory = self::createStub(TimeFactoryInterface::class); $time_factory->method('now')->willReturn($now + 1.6); Registry::timeFactory($time_factory); diff --git a/tests/app/Services/UserServiceTest.php b/tests/app/Services/UserServiceTest.php index 0e6cb16174..e8565c0572 100644 --- a/tests/app/Services/UserServiceTest.php +++ b/tests/app/Services/UserServiceTest.php @@ -34,7 +34,7 @@ class UserServiceTest extends TestCase { parent::setUp(); - $cache_factory = $this->createStub(CacheFactoryInterface::class); + $cache_factory = self::createStub(CacheFactoryInterface::class); $cache_factory->method('array')->willReturn(new Cache(new NullAdapter())); Registry::cache($cache_factory); } diff --git a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php index ba82dd6f40..b9688da9a9 100644 --- a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php @@ -37,16 +37,16 @@ class DefaultSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Chris /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Chris /White/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -67,10 +67,10 @@ class DefaultSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -91,10 +91,10 @@ class DefaultSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php index 770098869c..210f99870f 100644 --- a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php @@ -37,16 +37,16 @@ class IcelandicSurnameTraditionTest extends TestCase public function testNewSonNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Jon Einarsson'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Eva Stefansdottir'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -57,16 +57,16 @@ class IcelandicSurnameTraditionTest extends TestCase public function testNewDaughterNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Jon Einarsson'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Eva Stefansdottir'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -77,16 +77,16 @@ class IcelandicSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Jon Einarsson'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Eva Stefansdottir'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -97,10 +97,10 @@ class IcelandicSurnameTraditionTest extends TestCase public function testNewFatherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Jon Einarsson'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -111,10 +111,10 @@ class IcelandicSurnameTraditionTest extends TestCase public function testNewMotherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Jon Evasdottir'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -125,10 +125,10 @@ class IcelandicSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Jon Einarsson'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -139,10 +139,10 @@ class IcelandicSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Jon Einarsson'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php index 7c11098f66..55a865ae24 100644 --- a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php @@ -45,16 +45,16 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewSonNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -65,16 +65,16 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewDaughterNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -85,16 +85,16 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewDaughterNamesInflected(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whita/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -102,10 +102,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whitas/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); self::assertSame( @@ -113,10 +113,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whitis/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); self::assertSame( @@ -124,10 +124,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whitys/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); self::assertSame( @@ -135,10 +135,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whitius/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); self::assertSame( @@ -146,10 +146,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whitus/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); self::assertSame( @@ -160,16 +160,16 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -188,10 +188,10 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewFatherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('John /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -202,10 +202,10 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewFatherNamesInflected(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Mary /Whitaitė/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -213,10 +213,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newParentNames($individual, 'M') ); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Mary /Whitytė/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -224,10 +224,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newParentNames($individual, 'M') ); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Mary /Whitiūtė/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -235,10 +235,10 @@ class LithuanianSurnameTraditionTest extends TestCase $this->surname_tradition->newParentNames($individual, 'M') ); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Mary /Whitutė/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -249,10 +249,10 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewMotherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('John /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -263,10 +263,10 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('John /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -277,10 +277,10 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewHusbandNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Mary /Black/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -291,10 +291,10 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewWifeNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('John /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -305,10 +305,10 @@ class LithuanianSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('John /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php index f8cba3c56a..32efc541c2 100644 --- a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php @@ -44,16 +44,16 @@ class MatrilinealSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -74,16 +74,16 @@ class MatrilinealSurnameTraditionTest extends TestCase public function testNewChildNamesWithSpfx(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /de White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /van Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -102,10 +102,10 @@ class MatrilinealSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -126,10 +126,10 @@ class MatrilinealSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php index 914e3afea5..c55f29e3cb 100644 --- a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php @@ -37,16 +37,16 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -67,16 +67,16 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewChildNamesWithSpfx(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /de White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /van Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -87,16 +87,16 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewChildNamesWithMultipleSpfx(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /van der White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /van Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -107,16 +107,16 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewChildNamesWithDutchSpfx(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /\'t White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /van Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -127,16 +127,16 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewChildNamesWithMultipleDutchSpfx(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /van \'t White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /van Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -147,10 +147,10 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewFatherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -161,10 +161,10 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewMotherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -175,10 +175,10 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -189,10 +189,10 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewHusbandNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -203,10 +203,10 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewWifeNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -217,10 +217,10 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewWifeNamesWithSpfx(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /van der White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -231,10 +231,10 @@ class PaternalSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php index 3e2ce9311f..4dc632374f 100644 --- a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php @@ -44,16 +44,16 @@ class PatrilinealSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -74,16 +74,16 @@ class PatrilinealSurnameTraditionTest extends TestCase public function testNewChildNamesWithSpfx(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /de White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /van Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -102,10 +102,10 @@ class PatrilinealSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -126,10 +126,10 @@ class PatrilinealSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php index 5daf8eb679..82a34dc6dc 100644 --- a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php @@ -38,16 +38,16 @@ class PolishSurnameTraditionTest extends TestCase public function testNewSonNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -58,16 +58,16 @@ class PolishSurnameTraditionTest extends TestCase public function testNewDaughterNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -78,16 +78,16 @@ class PolishSurnameTraditionTest extends TestCase public function testNewDaughterNamesInflected(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whitecki/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -95,16 +95,16 @@ class PolishSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whitedzki/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -112,16 +112,16 @@ class PolishSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whiteski/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -129,16 +129,16 @@ class PolishSurnameTraditionTest extends TestCase $this->surname_tradition->newChildNames($father, $mother, 'F') ); - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /Whiteżki/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -149,16 +149,16 @@ class PolishSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('John /White/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Mary /Black/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -177,10 +177,10 @@ class PolishSurnameTraditionTest extends TestCase public function testNewFatherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -191,10 +191,10 @@ class PolishSurnameTraditionTest extends TestCase public function testNewFatherNamesInflected(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /Whitecka/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -202,10 +202,10 @@ class PolishSurnameTraditionTest extends TestCase $this->surname_tradition->newParentNames($individual, 'M') ); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /Whitedzka/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -213,10 +213,10 @@ class PolishSurnameTraditionTest extends TestCase $this->surname_tradition->newParentNames($individual, 'M') ); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /Whiteska/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -224,10 +224,10 @@ class PolishSurnameTraditionTest extends TestCase $this->surname_tradition->newParentNames($individual, 'M') ); - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /Whiteżka/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -238,10 +238,10 @@ class PolishSurnameTraditionTest extends TestCase public function testNewMotherNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -252,10 +252,10 @@ class PolishSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -266,10 +266,10 @@ class PolishSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Chris /White/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php index 27090218e2..cfbb95a7e1 100644 --- a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php @@ -44,16 +44,16 @@ class PortugueseSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Gabriel /Garcia/ /Iglesias/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Maria /Ruiz/ /Lorca/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -82,16 +82,16 @@ class PortugueseSurnameTraditionTest extends TestCase public function testNewChildNamesCompunds(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Gabriel /Garcia/ y /Iglesias/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Maria /Ruiz/ y /Lorca/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -102,10 +102,10 @@ class PortugueseSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Gabriel /Garcia/ /Iglesias/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -125,10 +125,10 @@ class PortugueseSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Gabriel /Garcia/ /Iglesias/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php index 50f7c19623..ee9e9ac982 100644 --- a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php +++ b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php @@ -37,16 +37,16 @@ class SpanishSurnameTraditionTest extends TestCase public function testNewChildNames(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Gabriel /Garcia/ /Iglesias/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Gabriel /Ruiz/ /Lorca/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -75,16 +75,16 @@ class SpanishSurnameTraditionTest extends TestCase public function testNewChildNamesCompound(): void { - $father_fact = $this->createStub(Fact::class); + $father_fact = self::createStub(Fact::class); $father_fact->method('value')->willReturn('Gabriel /Garcia/ y /Iglesias/'); - $father = $this->createStub(Individual::class); + $father = self::createStub(Individual::class); $father->method('facts')->willReturn(new Collection([$father_fact])); - $mother_fact = $this->createStub(Fact::class); + $mother_fact = self::createStub(Fact::class); $mother_fact->method('value')->willReturn('Gabriel /Ruiz/ y /Lorca/'); - $mother = $this->createStub(Individual::class); + $mother = self::createStub(Individual::class); $mother->method('facts')->willReturn(new Collection([$mother_fact])); self::assertSame( @@ -95,10 +95,10 @@ class SpanishSurnameTraditionTest extends TestCase public function testNewParentNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Gabriel /Garcia/ /Iglesias/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( @@ -119,10 +119,10 @@ class SpanishSurnameTraditionTest extends TestCase public function testNewSpouseNames(): void { - $fact = $this->createStub(Fact::class); + $fact = self::createStub(Fact::class); $fact->method('value')->willReturn('Gabriel /Garcia/ /Iglesias/'); - $individual = $this->createStub(Individual::class); + $individual = self::createStub(Individual::class); $individual->method('facts')->willReturn(new Collection([$fact])); self::assertSame( diff --git a/tests/app/TreeTest.php b/tests/app/TreeTest.php index 3a58e995f3..beb0666dd7 100644 --- a/tests/app/TreeTest.php +++ b/tests/app/TreeTest.php @@ -46,7 +46,7 @@ class TreeTest extends TestCase { parent::setUp(); - $cache_factory = $this->createStub(CacheFactoryInterface::class); + $cache_factory = self::createStub(CacheFactoryInterface::class); $cache_factory->method('array')->willReturn(new Cache(new NullAdapter())); Registry::cache($cache_factory); } diff --git a/tests/app/UserTest.php b/tests/app/UserTest.php index 87aa2eb47a..1236329964 100644 --- a/tests/app/UserTest.php +++ b/tests/app/UserTest.php @@ -33,7 +33,7 @@ class UserTest extends TestCase { parent::setUp(); - $cache_factory = $this->createStub(CacheFactoryInterface::class); + $cache_factory = self::createStub(CacheFactoryInterface::class); $cache_factory->method('array')->willReturn(new Cache(new NullAdapter())); Registry::cache($cache_factory); } diff --git a/tests/app/ValidatorTest.php b/tests/app/ValidatorTest.php index 2c00325ca8..edd646d7b9 100644 --- a/tests/app/ValidatorTest.php +++ b/tests/app/ValidatorTest.php @@ -30,7 +30,7 @@ class ValidatorTest extends TestCase { public function testAttributes(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getAttributes') ->willReturn(['param' => 'test']); @@ -40,7 +40,7 @@ class ValidatorTest extends TestCase public function testParsedBody(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getParsedBody') ->willReturn(['param' => 'test']); @@ -50,7 +50,7 @@ class ValidatorTest extends TestCase public function testQueryParams(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['param' => 'test']); @@ -60,7 +60,7 @@ class ValidatorTest extends TestCase public function testServerParams(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getServerParams') ->willReturn(['param' => 'test']); @@ -70,7 +70,7 @@ class ValidatorTest extends TestCase public function testNonUTF8QueryParameterName(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(["\xFF" => 'test']); @@ -82,7 +82,7 @@ class ValidatorTest extends TestCase public function testNonUTF8QueryParameterValue(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['test' => "\xFF"]); @@ -94,7 +94,7 @@ class ValidatorTest extends TestCase public function testRequiredArrayParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['param' => ['test'], 'invalid' => 'not_array']); @@ -108,7 +108,7 @@ class ValidatorTest extends TestCase public function testRequiredBooleanParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn([ @@ -135,7 +135,7 @@ class ValidatorTest extends TestCase public function testRequiredIntegerParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn([ @@ -158,9 +158,9 @@ class ValidatorTest extends TestCase public function testRequiredRouteParameter(): void { - $route = $this->createStub(Route::class); + $route = self::createStub(Route::class); - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn([ @@ -177,7 +177,7 @@ class ValidatorTest extends TestCase public function testRequiredStringParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['param' => 'test', 'invalid' => ['not_string']]); @@ -191,9 +191,9 @@ class ValidatorTest extends TestCase public function testRequiredTreeParameter(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn([ @@ -210,9 +210,9 @@ class ValidatorTest extends TestCase public function testOptionalTreeParameter(): void { - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn([ @@ -230,9 +230,9 @@ class ValidatorTest extends TestCase public function testRequiredUserParameter(): void { - $user = $this->createStub(UserInterface::class); + $user = self::createStub(UserInterface::class); - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn([ @@ -249,7 +249,7 @@ class ValidatorTest extends TestCase public function testIsBetweenParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['param' => '42', 'invalid' => '10', 'wrongtype' => 'not_integer']); @@ -261,7 +261,7 @@ class ValidatorTest extends TestCase public function testIsInArray(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['param' => 'foo']); @@ -275,7 +275,7 @@ class ValidatorTest extends TestCase public function testIsInArrayKeys(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['param' => 'foo']); @@ -289,7 +289,7 @@ class ValidatorTest extends TestCase public function testIsNotEmpty(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['empty' => '', 'not-empty' => 'foo']); @@ -303,7 +303,7 @@ class ValidatorTest extends TestCase public function testIsTagParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['valid' => 'BIRT', 'invalid' => '@X1@']); @@ -317,7 +317,7 @@ class ValidatorTest extends TestCase public function testIsXrefParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['valid' => 'X1', 'invalid' => '@X1@', 'valid-array' => ['X1'], 'invalid-array' => ['@X1@']]); @@ -333,7 +333,7 @@ class ValidatorTest extends TestCase public function testIsLocalUrlParameter(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(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 = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getAttribute') ->with('base_url') @@ -363,7 +363,7 @@ class ValidatorTest extends TestCase public function testIsLocalUrlParameterWrongDomain(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getAttribute') ->with('base_url') @@ -379,7 +379,7 @@ class ValidatorTest extends TestCase public function testIsLocalUrlParameterWrongType(): void { - $request = $this->createStub(ServerRequestInterface::class); + $request = self::createStub(ServerRequestInterface::class); $request ->method('getQueryParams') ->willReturn(['wrongtype' => ['42']]); diff --git a/tests/feature/RelationshipNamesTest.php b/tests/feature/RelationshipNamesTest.php index 18afe03b89..20073d8c4b 100644 --- a/tests/feature/RelationshipNamesTest.php +++ b/tests/feature/RelationshipNamesTest.php @@ -68,10 +68,10 @@ class RelationshipNamesTest extends TestCase // Individual suffixes - m(ale), f(emale), u(nknown), a(dopted), o(foster) // Family suffixes - m(arried), d(ivorced), e(ngaged) // - $tree = $this->createStub(Tree::class); + $tree = self::createStub(Tree::class); - $individual_factory = $this->createStub(IndividualFactory::class); - $family_factory = $this->createStub(FamilyFactory::class); + $individual_factory = self::createStub(IndividualFactory::class); + $family_factory = self::createStub(FamilyFactory::class); Registry::familyFactory($family_factory); Registry::individualFactory($individual_factory); |