diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-02-15 21:08:11 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-02-16 14:26:05 +0000 |
| commit | 39ca88ba08cefcfcaf891abfcf748f9c808eb326 (patch) | |
| tree | 09fb6844b1e44eeb1755671f00317f914644231b /tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php | |
| parent | 888ddf4f75ad7e5e5b322ccfa329fb24ddc9af04 (diff) | |
| download | webtrees-39ca88ba08cefcfcaf891abfcf748f9c808eb326.tar.gz webtrees-39ca88ba08cefcfcaf891abfcf748f9c808eb326.tar.bz2 webtrees-39ca88ba08cefcfcaf891abfcf748f9c808eb326.zip | |
Rename functions getFoo() to foo() and return collections instead of arrays
Diffstat (limited to 'tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php')
| -rw-r--r-- | tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php index 84cb52e06e..fcbcb52234 100644 --- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -50,10 +51,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -75,10 +76,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes $fact->shouldReceive('date')->andReturn(new Date('01 JAN 1859')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -100,10 +101,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes $fact->shouldReceive('date')->andReturn(new Date('02 JUN 1860')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -122,10 +123,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes public function testNoMarriage(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -144,7 +145,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes public function testNoSpouseFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); |