diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2025-09-12 13:23:12 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2025-09-15 08:34:27 +0100 |
| commit | 0c24b5f19dd466604c97c6e20a096cadadd2db57 (patch) | |
| tree | d63457ccc7e9fece4afe3038e949fe1e2bf73dfa | |
| parent | d172288247342770c7863479e9ba61c43ec7f26b (diff) | |
| download | webtrees-0c24b5f19dd466604c97c6e20a096cadadd2db57.tar.gz webtrees-0c24b5f19dd466604c97c6e20a096cadadd2db57.tar.bz2 webtrees-0c24b5f19dd466604c97c6e20a096cadadd2db57.zip | |
Use constants for better type inference
| -rw-r--r-- | app/Elements/EventTypeCitedFrom.php | 111 |
1 files changed, 52 insertions, 59 deletions
diff --git a/app/Elements/EventTypeCitedFrom.php b/app/Elements/EventTypeCitedFrom.php index d483e8dfd3..a331c90880 100644 --- a/app/Elements/EventTypeCitedFrom.php +++ b/app/Elements/EventTypeCitedFrom.php @@ -44,56 +44,54 @@ class EventTypeCitedFrom extends AbstractElement 'ROLE' => '0:1', ]; - protected const array FAMILY_EVENTS = [ - 'ANUL', - 'CENS', - 'DIV', - 'DIVF', - 'ENGA', - 'MARR', - 'MARB', - 'MARC', - 'MARL', - 'MARS', - 'EVEN', - ]; - - protected const array INDIVIDUAL_EVENTS = [ - 'ADOP', - 'BIRT', - 'BAPM', - 'BARM', - 'BASM', - 'BLES', - 'BURI', - 'CENS', - 'CHR', - 'CHRA', - 'CONF', - 'CREM', - 'DEAT', - 'EMIG', - 'FCOM', - 'GRAD', - 'IMMI', - 'NATU', - 'ORDN', - 'RETI', - 'PROB', - 'WILL', - 'EVEN', - ]; - - protected const array ATTRIBUTE_TYPES = [ - 'CAST', - 'EDUC', - 'NATI', - 'OCCU', - 'PROP', - 'RELI', - 'RESI', - 'TITL', - 'FACT', + protected const array EVENT_TYPES = [ + 'FAM' => [ + 'ANUL', + 'CENS', + 'DIV', + 'DIVF', + 'ENGA', + 'MARR', + 'MARB', + 'MARC', + 'MARL', + 'MARS', + 'EVEN', + ], + 'INDI' => [ + 'ADOP', + 'BAPM', + 'BARM', + 'BASM', + 'BIRT', + 'BLES', + 'BURI', + 'CAST', + 'CENS', + 'CHR', + 'CHRA', + 'CONF', + 'CREM', + 'DEAT', + 'EDUC', + 'EMIG', + 'EVEN', + 'FACT', + 'FCOM', + 'GRAD', + 'IMMI', + 'NATI', + 'NATU', + 'OCCU', + 'ORDN', + 'PROB', + 'PROP', + 'RELI', + 'RESI', + 'RETI', + 'TITL', + 'WILL', + ], ]; /** @@ -103,19 +101,14 @@ class EventTypeCitedFrom extends AbstractElement */ public function values(): array { - $data = [ - Family::RECORD_TYPE => static::FAMILY_EVENTS, - Individual::RECORD_TYPE => array_merge(static::INDIVIDUAL_EVENTS, static::ATTRIBUTE_TYPES), - ]; - $values = ['' => '']; - foreach ($data as $record_type => $subtags) { - foreach ($subtags as $subtag) { - $element = Registry::elementFactory()->make($record_type . ':' . $subtag); + foreach (self::EVENT_TYPES as $record_type => $tags) { + foreach ($tags as $tag) { + $element = Registry::elementFactory()->make($record_type . ':' . $tag); if (!$element instanceof UnknownElement) { - $values[$subtag] = $element->label(); + $values[$tag] = $element->label(); } } } |