diff options
| -rw-r--r-- | app/Census/AbstractCensusColumn.php | 9 | ||||
| -rw-r--r-- | app/Census/CensusColumnConditionUs.php | 2 | ||||
| -rw-r--r-- | app/Census/CensusColumnRelationToHead.php | 5 | ||||
| -rw-r--r-- | app/Census/CensusColumnRelationToHeadEnglish.php | 3 | ||||
| -rw-r--r-- | app/Census/CensusColumnRelationToHeadGerman.php | 3 | ||||
| -rw-r--r-- | app/Census/CensusColumnSexMF.php | 10 | ||||
| -rw-r--r-- | app/Census/CensusColumnSexMK.php | 3 | ||||
| -rw-r--r-- | app/Census/CensusColumnSexMZ.php | 3 |
8 files changed, 14 insertions, 24 deletions
diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php index 73d0a59871..21c69cf42a 100644 --- a/app/Census/AbstractCensusColumn.php +++ b/app/Census/AbstractCensusColumn.php @@ -32,14 +32,11 @@ use function implode; */ class AbstractCensusColumn { - /** @var CensusInterface */ - private $census; + private CensusInterface $census; - /** @var string */ - private $abbr; + private string $abbr; - /** @var string */ - private $title; + private string $title; /** * Create a column for a census diff --git a/app/Census/CensusColumnConditionUs.php b/app/Census/CensusColumnConditionUs.php index 965f2e1a9d..6bca50dade 100644 --- a/app/Census/CensusColumnConditionUs.php +++ b/app/Census/CensusColumnConditionUs.php @@ -42,7 +42,7 @@ class CensusColumnConditionUs extends CensusColumnConditionEnglish // Text to display for female children protected const GIRL = 'S'; - /** @var string Text to display for divorced individuals */ + // Text to display for divorced individuals protected const DIVORCE = 'D'; // Text to display for divorced females diff --git a/app/Census/CensusColumnRelationToHead.php b/app/Census/CensusColumnRelationToHead.php index 7a3d0f957d..11f1b18806 100644 --- a/app/Census/CensusColumnRelationToHead.php +++ b/app/Census/CensusColumnRelationToHead.php @@ -28,8 +28,7 @@ use Fisharebest\Webtrees\Services\RelationshipService; */ class CensusColumnRelationToHead extends AbstractCensusColumn implements CensusColumnInterface { - /** @var string */ - protected $head_of_household = '-'; + protected const HEAD_OF_HOUSEHOLD = '-'; /** * Generate the likely value of this census column, based on available information. @@ -42,7 +41,7 @@ class CensusColumnRelationToHead extends AbstractCensusColumn implements CensusC public function generate(Individual $individual, Individual $head): string { if ($individual === $head) { - return $this->head_of_household; + return static::HEAD_OF_HOUSEHOLD; } return app(RelationshipService::class)->getCloseRelationshipName($head, $individual); diff --git a/app/Census/CensusColumnRelationToHeadEnglish.php b/app/Census/CensusColumnRelationToHeadEnglish.php index 1564d46565..7f6733074f 100644 --- a/app/Census/CensusColumnRelationToHeadEnglish.php +++ b/app/Census/CensusColumnRelationToHeadEnglish.php @@ -24,6 +24,5 @@ namespace Fisharebest\Webtrees\Census; */ class CensusColumnRelationToHeadEnglish extends CensusColumnRelationToHead { - /** @var string */ - protected $head_of_household = 'head'; + protected const HEAD_OF_HOUSEHOLD = 'head'; } diff --git a/app/Census/CensusColumnRelationToHeadGerman.php b/app/Census/CensusColumnRelationToHeadGerman.php index 16adbb3261..c75198aaa5 100644 --- a/app/Census/CensusColumnRelationToHeadGerman.php +++ b/app/Census/CensusColumnRelationToHeadGerman.php @@ -24,6 +24,5 @@ namespace Fisharebest\Webtrees\Census; */ class CensusColumnRelationToHeadGerman extends CensusColumnRelationToHead { - /** @var string */ - protected $head_of_household = 'Haushaltungsvorstand'; + protected const HEAD_OF_HOUSEHOLD = 'Haushaltungsvorstand'; } diff --git a/app/Census/CensusColumnSexMF.php b/app/Census/CensusColumnSexMF.php index 3740c1c60b..0b78056cd4 100644 --- a/app/Census/CensusColumnSexMF.php +++ b/app/Census/CensusColumnSexMF.php @@ -26,11 +26,9 @@ use Fisharebest\Webtrees\Individual; */ class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInterface { - /** @var string Text to display for male individuals */ - protected $male = 'M'; + protected const MALE = 'M'; - /** @var string Text to display for female individuals */ - protected $female = 'F'; + protected const FEMALE = 'F'; /** * Generate the likely value of this census column, based on available information. @@ -44,9 +42,9 @@ class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInte { switch ($individual->sex()) { case 'M': - return $this->male; + return static::MALE; case 'F': - return $this->female; + return static::FEMALE; default: return ''; } diff --git a/app/Census/CensusColumnSexMK.php b/app/Census/CensusColumnSexMK.php index 31f48f347b..8de143399e 100644 --- a/app/Census/CensusColumnSexMK.php +++ b/app/Census/CensusColumnSexMK.php @@ -24,6 +24,5 @@ namespace Fisharebest\Webtrees\Census; */ class CensusColumnSexMK extends CensusColumnSexMF { - /** @var string Text to display for female individuals */ - protected $female = 'K'; + protected const FEMALE = 'K'; } diff --git a/app/Census/CensusColumnSexMZ.php b/app/Census/CensusColumnSexMZ.php index ec1f633295..b20d56d524 100644 --- a/app/Census/CensusColumnSexMZ.php +++ b/app/Census/CensusColumnSexMZ.php @@ -24,6 +24,5 @@ namespace Fisharebest\Webtrees\Census; */ class CensusColumnSexMZ extends CensusColumnSexMF { - /** @var string Text to display for female individuals */ - protected $female = 'Ž'; + protected const FEMALE = 'Ž'; } |