Prefer class-constants to global-constants

8 files changed, 9 insertions, 9 deletions

diff --git a/app/Census/AbstractCensusColumnCondition.php b/app/Census/AbstractCensusColumnCondition.php
index a15569bd0f..44ec1366f3 100644
--- a/app/Census/AbstractCensusColumnCondition.php
+++ b/app/Census/AbstractCensusColumnCondition.php
@@ -71,7 +71,7 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem
         $family = $this->spouseFamily($individual);
         $sex    = $individual->getSex();
 
-        if ($family === null || count($family->facts('MARR')) === 0) {
+        if ($family === null || count($family->facts(['MARR'])) === 0) {
             if ($this->isChild($individual)) {
                 return $this->conditionChild($sex);
             }
@@ -79,7 +79,7 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem
             return $this->conditionSingle($sex);
         }
 
-        if (count($family->facts('DIV')) > 0) {
+        if (count($family->facts(['DIV'])) > 0) {
             return $this->conditionDivorced($sex);
         }
 
diff --git a/app/Census/CensusColumnAgeMarried.php b/app/Census/CensusColumnAgeMarried.php
index 8185c345de..93406d8b01 100644
--- a/app/Census/CensusColumnAgeMarried.php
+++ b/app/Census/CensusColumnAgeMarried.php
@@ -37,7 +37,7 @@ class CensusColumnAgeMarried extends AbstractCensusColumn implements CensusColum
     {
         if ($individual->getBirthDate()->isOK()) {
             foreach ($individual->getSpouseFamilies() as $family) {
-                foreach ($family->facts('MARR', true) as $fact) {
+                foreach ($family->facts(['MARR'], true) as $fact) {
                     if ($fact->date()->isOK()) {
                         return (string) Date::getAgeYears($individual->getBirthDate(), $fact->date());
                     }
diff --git a/app/Census/CensusColumnFullName.php b/app/Census/CensusColumnFullName.php
index 85044997d3..1772adefe1 100644
--- a/app/Census/CensusColumnFullName.php
+++ b/app/Census/CensusColumnFullName.php
@@ -55,7 +55,7 @@ class CensusColumnFullName extends AbstractCensusColumn implements CensusColumnI
         $name  = $names[0];
 
         foreach ($individual->getSpouseFamilies() as $family) {
-            foreach ($family->facts('MARR') as $marriage) {
+            foreach ($family->facts(['MARR']) as $marriage) {
                 if ($marriage->date()->isOK() && Date::compare($marriage->date(), $census_date) < 0) {
                     $spouse = $family->getSpouse($individual);
                     foreach ($names as $individual_name) {
diff --git a/app/Census/CensusColumnMarriedWithinYear.php b/app/Census/CensusColumnMarriedWithinYear.php
index d19f4efa81..fcbb450431 100644
--- a/app/Census/CensusColumnMarriedWithinYear.php
+++ b/app/Census/CensusColumnMarriedWithinYear.php
@@ -35,7 +35,7 @@ class CensusColumnMarriedWithinYear extends AbstractCensusColumn implements Cens
     public function generate(Individual $individual, Individual $head): string
     {
         foreach ($individual->getSpouseFamilies() as $family) {
-            foreach ($family->facts('MARR') as $fact) {
+            foreach ($family->facts(['MARR']) as $fact) {
                 $marriage_jd = $fact->date()->julianDay();
                 $census_jd   = $this->date()->julianDay();
                 if ($marriage_jd <= $census_jd && $marriage_jd >= $census_jd - 365) {
diff --git a/app/Census/CensusColumnMonthIfMarriedWithinYear.php b/app/Census/CensusColumnMonthIfMarriedWithinYear.php
index a972017e51..55d0e81760 100644
--- a/app/Census/CensusColumnMonthIfMarriedWithinYear.php
+++ b/app/Census/CensusColumnMonthIfMarriedWithinYear.php
@@ -35,7 +35,7 @@ class CensusColumnMonthIfMarriedWithinYear extends AbstractCensusColumn implemen
     public function generate(Individual $individual, Individual $head): string
     {
         foreach ($individual->getSpouseFamilies() as $family) {
-            foreach ($family->facts('MARR') as $fact) {
+            foreach ($family->facts(['MARR']) as $fact) {
                 $marriage_jd = $fact->date()->julianDay();
                 $census_jd   = $this->date()->julianDay();
                 if ($marriage_jd <= $census_jd && $marriage_jd >= $census_jd - 365) {
diff --git a/app/Census/CensusColumnNationality.php b/app/Census/CensusColumnNationality.php
index eaf3272b67..bb80028618 100644
--- a/app/Census/CensusColumnNationality.php
+++ b/app/Census/CensusColumnNationality.php
@@ -52,7 +52,7 @@ class CensusColumnNationality extends AbstractCensusColumn implements CensusColu
         }
 
         // Did we emigrate or naturalise?
-        foreach ($individual->facts('IMMI|EMIG|NATU', true) as $fact) {
+        foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) {
             if (Date::compare($fact->date(), $this->date()) <= 0) {
                 $place = $fact->place()->getGedcomName();
             }
diff --git a/app/Census/CensusColumnOccupation.php b/app/Census/CensusColumnOccupation.php
index ad84e4ade4..8e0727f35e 100644
--- a/app/Census/CensusColumnOccupation.php
+++ b/app/Census/CensusColumnOccupation.php
@@ -34,7 +34,7 @@ class CensusColumnOccupation extends AbstractCensusColumn implements CensusColum
      */
     public function generate(Individual $individual, Individual $head): string
     {
-        foreach ($individual->facts('OCCU') as $fact) {
+        foreach ($individual->facts(['OCCU']) as $fact) {
             return $fact->value();
         }
 
diff --git a/app/Census/CensusColumnYearsMarried.php b/app/Census/CensusColumnYearsMarried.php
index 1b7eb60097..cb8108fa6a 100644
--- a/app/Census/CensusColumnYearsMarried.php
+++ b/app/Census/CensusColumnYearsMarried.php
@@ -38,7 +38,7 @@ class CensusColumnYearsMarried extends AbstractCensusColumn implements CensusCol
         $marriage_date = null;
 
         foreach ($individual->getSpouseFamilies() as $family) {
-            foreach ($family->facts('MARR', true) as $fact) {
+            foreach ($family->facts(['MARR'], true) as $fact) {
                 if ($fact->date()->isOK() && Date::compare($fact->date(), $this->date()) <= 0) {
                     $marriage_date = $fact->date();
                 }