Update tests to work with phpunit 10

16 files changed, 104 insertions, 301 deletions

diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
index f0719cfa25..8f0fc0342e 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedSingleTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -180,10 +177,7 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -317,10 +311,8 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -352,10 +344,8 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -387,10 +377,8 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
@@ -422,10 +410,8 @@ class CensusColumnConditionCanadaMarriedSingleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
diff --git a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
index 0ad06bd26f..58b0bfbeb2 100644
--- a/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaMarriedWidowedTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -180,10 +177,7 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -317,10 +311,8 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -352,10 +344,8 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -387,10 +377,8 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
@@ -422,10 +410,8 @@ class CensusColumnConditionCanadaMarriedWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
diff --git a/tests/app/Census/CensusColumnConditionCanadaTest.php b/tests/app/Census/CensusColumnConditionCanadaTest.php
index dac5991aca..7c6e71ae9b 100644
--- a/tests/app/Census/CensusColumnConditionCanadaTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaTest.php
@@ -141,10 +141,7 @@ class CensusColumnConditionCanadaTest extends TestCase
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -181,10 +178,7 @@ class CensusColumnConditionCanadaTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -318,10 +312,8 @@ class CensusColumnConditionCanadaTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -353,10 +345,8 @@ class CensusColumnConditionCanadaTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -388,10 +378,8 @@ class CensusColumnConditionCanadaTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
@@ -423,10 +411,8 @@ class CensusColumnConditionCanadaTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
index 639b6bde61..ce602f16e5 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedFemaleTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -180,10 +177,7 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -317,10 +311,8 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -352,10 +344,8 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -387,10 +377,8 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
@@ -422,10 +410,8 @@ class CensusColumnConditionCanadaWidowedFemaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
index 5ee7f35e68..a182894e3c 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedMaleTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -180,10 +177,7 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -317,10 +311,8 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -352,10 +344,8 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -387,10 +377,8 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
@@ -422,10 +410,8 @@ class CensusColumnConditionCanadaWidowedMaleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
diff --git a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
index cfbec150fb..5edad6bfcb 100644
--- a/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
+++ b/tests/app/Census/CensusColumnConditionCanadaWidowedTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -180,10 +177,7 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -317,10 +311,8 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -352,10 +344,8 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -387,10 +377,8 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
@@ -422,10 +410,8 @@ class CensusColumnConditionCanadaWidowedTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 5474c4109d..145f41ea7c 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionDanishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -179,10 +176,7 @@ class CensusColumnConditionDanishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -315,10 +309,7 @@ class CensusColumnConditionDanishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -350,10 +341,7 @@ class CensusColumnConditionDanishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 601b22dba5..36f434af15 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionEnglishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -179,10 +176,7 @@ class CensusColumnConditionEnglishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -315,10 +309,7 @@ class CensusColumnConditionEnglishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -350,10 +341,7 @@ class CensusColumnConditionEnglishTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
index 80fd885b30..d29e6f2332 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -179,10 +176,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -315,10 +309,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -350,10 +341,7 @@ class CensusColumnConditionFrenchFemmeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
index 5673241b78..d37ffe537b 100644
--- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -179,10 +176,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -315,10 +309,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -350,10 +341,7 @@ class CensusColumnConditionFrenchFilleTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
index 3a26ba22d9..af5425c527 100644
--- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -179,10 +176,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -315,10 +309,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -350,10 +341,7 @@ class CensusColumnConditionFrenchGarconTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
index 442c4bfe2d..692f405b76 100644
--- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -179,10 +176,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -315,10 +309,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -350,10 +341,7 @@ class CensusColumnConditionFrenchHommeTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
index 983b8580fc..b441493224 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -179,10 +176,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -315,10 +309,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -350,10 +341,7 @@ class CensusColumnConditionFrenchVeufTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
index 43c7a19ece..0eb1c8c942 100644
--- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
+++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php
@@ -141,10 +141,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -181,10 +178,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -318,10 +312,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
@@ -354,10 +345,7 @@ class CensusColumnConditionFrenchVeuveTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturn(
                 new Collection([$fact]),
                 new Collection([$fact])
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index 86d0822405..0601e7a97f 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -140,10 +140,7 @@ class CensusColumnConditionUsTest extends TestCase
         $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
         $family->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -180,10 +177,7 @@ class CensusColumnConditionUsTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
             ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
@@ -317,10 +311,8 @@ class CensusColumnConditionUsTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -352,10 +344,8 @@ class CensusColumnConditionUsTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection([$fact])
             );
@@ -387,10 +377,8 @@ class CensusColumnConditionUsTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
@@ -422,10 +410,8 @@ class CensusColumnConditionUsTest extends TestCase
         $family
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['MARR']],
-                [['DIV']]
-            )->willReturnOnConsecutiveCalls(
+            ->with(self::withConsecutive([['MARR'], ['DIV']]))
+            ->willReturnOnConsecutiveCalls(
                 new Collection([$fact]),
                 new Collection()
             );
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 8a57f58c26..8c1fb85ef4 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -40,7 +40,7 @@ class CensusColumnReligionTest extends TestCase
         $individual
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive([['RELI']], [])
+            ->with(self::withConsecutive([['RELI'], []]))
             ->willReturnOnConsecutiveCalls(new Collection(), new Collection());
 
         $census = $this->createMock(CensusInterface::class);
@@ -82,10 +82,7 @@ class CensusColumnReligionTest extends TestCase
         $individual
             ->expects(self::exactly(2))
             ->method('facts')
-            ->withConsecutive(
-                [['RELI']],
-                []
-            )
+            ->with(self::withConsecutive([['RELI'], []]))
             ->willReturnOnConsecutiveCalls(
                 new Collection(),
                 new Collection([$fact])