diff options
Diffstat (limited to 'app/Census')
21 files changed, 83 insertions, 79 deletions
diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php index 61af235270..062a1e135d 100644 --- a/app/Census/AbstractCensusColumn.php +++ b/app/Census/AbstractCensusColumn.php @@ -71,9 +71,9 @@ class AbstractCensusColumn if ($family) { return $family->getHusband(); - } else { - return null; } + + return null; } /** @@ -89,9 +89,9 @@ class AbstractCensusColumn if ($family) { return $family->getWife(); - } else { - return null; } + + return null; } /** @@ -113,13 +113,13 @@ class AbstractCensusColumn if (empty($families)) { return null; - } else { - usort($families, function (Family $x, Family $y): int { - return Date::compare($x->getMarriageDate(), $y->getMarriageDate()); - }); - - return end($families); } + + usort($families, function (Family $x, Family $y): int { + return Date::compare($x->getMarriageDate(), $y->getMarriageDate()); + }); + + return end($families); } /** @@ -169,9 +169,9 @@ class AbstractCensusColumn if (end($parts) === $this->place()) { return implode(', ', array_slice($parts, 0, -1)); - } else { - return $place; } + + return $place; } /** diff --git a/app/Census/AbstractCensusColumnCondition.php b/app/Census/AbstractCensusColumnCondition.php index 637b2e757f..01904d487e 100644 --- a/app/Census/AbstractCensusColumnCondition.php +++ b/app/Census/AbstractCensusColumnCondition.php @@ -73,19 +73,21 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem if ($family === null || count($family->getFacts('MARR')) === 0) { if ($this->isChild($individual)) { return $this->conditionChild($sex); - } else { - return $this->conditionSingle($sex); } - } elseif (count($family->getFacts('DIV')) > 0) { + + return $this->conditionSingle($sex); + } + + if (count($family->getFacts('DIV')) > 0) { return $this->conditionDivorced($sex); - } else { - $spouse = $family->getSpouse($individual); - if ($spouse instanceof Individual && $this->isDead($spouse)) { - return $this->conditionWidowed($sex); - } else { - return $this->conditionMarried($sex); - } } + + $spouse = $family->getSpouse($individual); + if ($spouse instanceof Individual && $this->isDead($spouse)) { + return $this->conditionWidowed($sex); + } + + return $this->conditionMarried($sex); } /** @@ -113,9 +115,9 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem { if ($sex === 'F') { return $this->girl; - } else { - return $this->boy; } + + return $this->boy; } /** @@ -129,9 +131,9 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem { if ($sex === 'F') { return $this->spinster; - } else { - return $this->bachelor; } + + return $this->bachelor; } /** @@ -145,9 +147,9 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem { if ($sex === 'F') { return $this->divorcee; - } else { - return $this->divorce; } + + return $this->divorce; } /** @@ -173,9 +175,9 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem { if ($sex === 'F') { return $this->widow; - } else { - return $this->widower; } + + return $this->widower; } /** @@ -189,8 +191,8 @@ abstract class AbstractCensusColumnCondition extends AbstractCensusColumn implem { if ($sex === 'F') { return $this->wife; - } else { - return $this->husband; } + + return $this->husband; } } diff --git a/app/Census/CensusColumnAgeFemale.php b/app/Census/CensusColumnAgeFemale.php index 78962ff357..42bbe34bfc 100644 --- a/app/Census/CensusColumnAgeFemale.php +++ b/app/Census/CensusColumnAgeFemale.php @@ -36,8 +36,8 @@ class CensusColumnAgeFemale extends AbstractCensusColumn implements CensusColumn { if ($individual->getSex() === 'M') { return ''; - } else { - return (string) Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); } + + return (string) Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); } } diff --git a/app/Census/CensusColumnAgeFemale5Years.php b/app/Census/CensusColumnAgeFemale5Years.php index 8f525aa332..34b34a7b44 100644 --- a/app/Census/CensusColumnAgeFemale5Years.php +++ b/app/Census/CensusColumnAgeFemale5Years.php @@ -36,13 +36,13 @@ class CensusColumnAgeFemale5Years extends AbstractCensusColumn implements Census { if ($individual->getSex() === 'M') { return ''; - } else { - $years = Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); - if ($years > 15) { - $years -= $years % 5; - } + } - return (string)$years; + $years = Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); + if ($years > 15) { + $years -= $years % 5; } + + return (string) $years; } } diff --git a/app/Census/CensusColumnAgeMale.php b/app/Census/CensusColumnAgeMale.php index c202982678..e488d740bb 100644 --- a/app/Census/CensusColumnAgeMale.php +++ b/app/Census/CensusColumnAgeMale.php @@ -36,8 +36,8 @@ class CensusColumnAgeMale extends AbstractCensusColumn implements CensusColumnIn { if ($individual->getSex() === 'F') { return ''; - } else { - return (string) Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); } + + return (string) Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); } } diff --git a/app/Census/CensusColumnAgeMale5Years.php b/app/Census/CensusColumnAgeMale5Years.php index ea0234b3d4..6d94312783 100644 --- a/app/Census/CensusColumnAgeMale5Years.php +++ b/app/Census/CensusColumnAgeMale5Years.php @@ -36,13 +36,13 @@ class CensusColumnAgeMale5Years extends AbstractCensusColumn implements CensusCo { if ($individual->getSex() === 'F') { return ''; - } else { - $years = Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); - if ($years > 15) { - $years -= $years % 5; - } + } - return (string)$years; + $years = Date::getAgeYears($individual->getEstimatedBirthDate(), $this->date()); + if ($years > 15) { + $years -= $years % 5; } + + return (string) $years; } } diff --git a/app/Census/CensusColumnBirthDayDotMonthYear.php b/app/Census/CensusColumnBirthDayDotMonthYear.php index 6c0cf2d3ea..a3609056d8 100644 --- a/app/Census/CensusColumnBirthDayDotMonthYear.php +++ b/app/Census/CensusColumnBirthDayDotMonthYear.php @@ -37,8 +37,8 @@ class CensusColumnBirthDayDotMonthYear extends AbstractCensusColumn implements C if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) { return $birth_date->minimumDate()->format('%j. %F %Y'); - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnBirthDayMonthSlashYear.php b/app/Census/CensusColumnBirthDayMonthSlashYear.php index b8bb7ec7a3..af4e88e75d 100644 --- a/app/Census/CensusColumnBirthDayMonthSlashYear.php +++ b/app/Census/CensusColumnBirthDayMonthSlashYear.php @@ -37,8 +37,8 @@ class CensusColumnBirthDayMonthSlashYear extends AbstractCensusColumn implements if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) { return $birth_date->minimumDate()->format('%j %M/%Y'); - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnBirthDaySlashMonth.php b/app/Census/CensusColumnBirthDaySlashMonth.php index 21003f5ebe..47c77bcd25 100644 --- a/app/Census/CensusColumnBirthDaySlashMonth.php +++ b/app/Census/CensusColumnBirthDaySlashMonth.php @@ -37,8 +37,8 @@ class CensusColumnBirthDaySlashMonth extends AbstractCensusColumn implements Cen if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) { return $birth_date->minimumDate()->format('%j/%n'); - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnBirthDaySlashMonthYear.php b/app/Census/CensusColumnBirthDaySlashMonthYear.php index e725fa5daf..7c95a3d17e 100644 --- a/app/Census/CensusColumnBirthDaySlashMonthYear.php +++ b/app/Census/CensusColumnBirthDaySlashMonthYear.php @@ -37,8 +37,8 @@ class CensusColumnBirthDaySlashMonthYear extends AbstractCensusColumn implements if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) { return $birth_date->minimumDate()->format('%j/%n %Y'); - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnBirthPlace.php b/app/Census/CensusColumnBirthPlace.php index 6e7a489179..5cc55afb60 100644 --- a/app/Census/CensusColumnBirthPlace.php +++ b/app/Census/CensusColumnBirthPlace.php @@ -43,8 +43,8 @@ class CensusColumnBirthPlace extends AbstractCensusColumn implements CensusColum if (substr($birth_place, -strlen($census_place) - 2) === ', ' . $census_place) { return substr($birth_place, 0, -strlen($census_place) - 2); - } else { - return $birth_place; } + + return $birth_place; } } diff --git a/app/Census/CensusColumnBornForeignParts.php b/app/Census/CensusColumnBornForeignParts.php index 66c2bcae93..bcf2edc9cd 100644 --- a/app/Census/CensusColumnBornForeignParts.php +++ b/app/Census/CensusColumnBornForeignParts.php @@ -46,10 +46,12 @@ class CensusColumnBornForeignParts extends AbstractCensusColumn implements Censu if ($birth_place === $census_place || $birth_place === '') { return ''; - } elseif ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') { + } + + if ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') { return substr($birth_place, 0, 1); - } else { - return 'F'; } + + return 'F'; } } diff --git a/app/Census/CensusColumnFatherBirthPlace.php b/app/Census/CensusColumnFatherBirthPlace.php index f52a6e6d33..6bac0e1bb7 100644 --- a/app/Census/CensusColumnFatherBirthPlace.php +++ b/app/Census/CensusColumnFatherBirthPlace.php @@ -37,8 +37,8 @@ class CensusColumnFatherBirthPlace extends AbstractCensusColumn implements Censu if ($father) { return $this->notCountry($father->getBirthPlace()->getGedcomName()); - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnFatherForeign.php b/app/Census/CensusColumnFatherForeign.php index a4008b571b..fa5eaf6440 100644 --- a/app/Census/CensusColumnFatherForeign.php +++ b/app/Census/CensusColumnFatherForeign.php @@ -37,8 +37,8 @@ class CensusColumnFatherForeign extends AbstractCensusColumn implements CensusCo if ($father && $this->lastPartOfPlace($father->getBirthPlace()->getGedcomName()) !== $this->place()) { return 'Y'; - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnGivenNameInitial.php b/app/Census/CensusColumnGivenNameInitial.php index 510888fbeb..a6dbf7d82c 100644 --- a/app/Census/CensusColumnGivenNameInitial.php +++ b/app/Census/CensusColumnGivenNameInitial.php @@ -37,9 +37,9 @@ class CensusColumnGivenNameInitial extends AbstractCensusColumn implements Censu $given = $name['givn']; if (strpos($given, ' ') === false) { return $given; - } else { - return substr($given, 0, strpos($given, ' ') + 2); } + + return substr($given, 0, strpos($given, ' ') + 2); } return ''; diff --git a/app/Census/CensusColumnMonthIfBornWithinYear.php b/app/Census/CensusColumnMonthIfBornWithinYear.php index 8c630b74da..5949abbb5b 100644 --- a/app/Census/CensusColumnMonthIfBornWithinYear.php +++ b/app/Census/CensusColumnMonthIfBornWithinYear.php @@ -38,8 +38,8 @@ class CensusColumnMonthIfBornWithinYear extends AbstractCensusColumn implements if ($birth_jd <= $census_jd && $birth_jd >= $census_jd - 365) { // Use the GEDCOM month, as we need this in English - for the US census return ucfirst(strtolower($individual->getBirthDate()->minimumDate()->format('%O'))); - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnMotherBirthPlace.php b/app/Census/CensusColumnMotherBirthPlace.php index 3512e5bc08..a9aa2b5aa9 100644 --- a/app/Census/CensusColumnMotherBirthPlace.php +++ b/app/Census/CensusColumnMotherBirthPlace.php @@ -37,8 +37,8 @@ class CensusColumnMotherBirthPlace extends AbstractCensusColumn implements Censu if ($mother) { return $this->notCountry($mother->getBirthPlace()->getGedcomName()); - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnMotherForeign.php b/app/Census/CensusColumnMotherForeign.php index e7aa31d933..4d292e678a 100644 --- a/app/Census/CensusColumnMotherForeign.php +++ b/app/Census/CensusColumnMotherForeign.php @@ -37,8 +37,8 @@ class CensusColumnMotherForeign extends AbstractCensusColumn implements CensusCo if ($mother && $this->lastPartOfPlace($mother->getBirthPlace()->getGedcomName()) !== $this->place()) { return 'Y'; - } else { - return ''; } + + return ''; } } diff --git a/app/Census/CensusColumnNationality.php b/app/Census/CensusColumnNationality.php index 7dbc86d80e..ca807a82c4 100644 --- a/app/Census/CensusColumnNationality.php +++ b/app/Census/CensusColumnNationality.php @@ -61,8 +61,8 @@ class CensusColumnNationality extends AbstractCensusColumn implements CensusColu if (array_key_exists($place, $this->nationalities)) { return $this->nationalities[$place]; - } else { - return $place; } + + return $place; } } diff --git a/app/Census/CensusColumnSurnameGivenNameInitial.php b/app/Census/CensusColumnSurnameGivenNameInitial.php index 6f1217211d..7e702935b7 100644 --- a/app/Census/CensusColumnSurnameGivenNameInitial.php +++ b/app/Census/CensusColumnSurnameGivenNameInitial.php @@ -37,8 +37,8 @@ class CensusColumnSurnameGivenNameInitial extends CensusColumnFullName $given = $name['givn']; if (strpos($given, ' ') === false) { return $name['surname'] . ', ' . $given; - } else { - return $name['surname'] . ', ' . substr($given, 0, strpos($given, ' ') + 2); } + + return $name['surname'] . ', ' . substr($given, 0, strpos($given, ' ') + 2); } } diff --git a/app/Census/CensusColumnYearsMarried.php b/app/Census/CensusColumnYearsMarried.php index 2eb9218a3d..c62e022a10 100644 --- a/app/Census/CensusColumnYearsMarried.php +++ b/app/Census/CensusColumnYearsMarried.php @@ -46,8 +46,8 @@ class CensusColumnYearsMarried extends AbstractCensusColumn implements CensusCol if ($marriage_date === null) { return ''; - } else { - return (string) Date::getAgeYears($marriage_date, $this->date()); } + + return (string) Date::getAgeYears($marriage_date, $this->date()); } } |