diff options
Diffstat (limited to 'app/SurnameTradition')
10 files changed, 30 insertions, 30 deletions
diff --git a/app/SurnameTradition/DefaultSurnameTradition.php b/app/SurnameTradition/DefaultSurnameTradition.php index 5d9bc65a65..01e10a0696 100644 --- a/app/SurnameTradition/DefaultSurnameTradition.php +++ b/app/SurnameTradition/DefaultSurnameTradition.php @@ -63,7 +63,7 @@ class DefaultSurnameTradition implements SurnameTraditionInterface * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -78,7 +78,7 @@ class DefaultSurnameTradition implements SurnameTraditionInterface * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -93,7 +93,7 @@ class DefaultSurnameTradition implements SurnameTraditionInterface * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array { diff --git a/app/SurnameTradition/IcelandicSurnameTradition.php b/app/SurnameTradition/IcelandicSurnameTradition.php index 9c04012a92..6b02b46ea9 100644 --- a/app/SurnameTradition/IcelandicSurnameTradition.php +++ b/app/SurnameTradition/IcelandicSurnameTradition.php @@ -44,7 +44,7 @@ class IcelandicSurnameTradition extends DefaultSurnameTradition * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -70,7 +70,7 @@ class IcelandicSurnameTradition extends DefaultSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -90,7 +90,7 @@ class IcelandicSurnameTradition extends DefaultSurnameTradition * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array { diff --git a/app/SurnameTradition/LithuanianSurnameTradition.php b/app/SurnameTradition/LithuanianSurnameTradition.php index 4f293e6af6..ebecd52b31 100644 --- a/app/SurnameTradition/LithuanianSurnameTradition.php +++ b/app/SurnameTradition/LithuanianSurnameTradition.php @@ -57,7 +57,7 @@ class LithuanianSurnameTradition extends PaternalSurnameTradition * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -86,7 +86,7 @@ class LithuanianSurnameTradition extends PaternalSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -108,7 +108,7 @@ class LithuanianSurnameTradition extends PaternalSurnameTradition * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array { diff --git a/app/SurnameTradition/MatrilinealSurnameTradition.php b/app/SurnameTradition/MatrilinealSurnameTradition.php index 431f8f4cdb..3f69957dce 100644 --- a/app/SurnameTradition/MatrilinealSurnameTradition.php +++ b/app/SurnameTradition/MatrilinealSurnameTradition.php @@ -31,7 +31,7 @@ class MatrilinealSurnameTradition extends DefaultSurnameTradition * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -54,7 +54,7 @@ class MatrilinealSurnameTradition extends DefaultSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { diff --git a/app/SurnameTradition/PaternalSurnameTradition.php b/app/SurnameTradition/PaternalSurnameTradition.php index 819487db82..232d96eaf5 100644 --- a/app/SurnameTradition/PaternalSurnameTradition.php +++ b/app/SurnameTradition/PaternalSurnameTradition.php @@ -40,7 +40,7 @@ class PaternalSurnameTradition extends PatrilinealSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -71,7 +71,7 @@ class PaternalSurnameTradition extends PatrilinealSurnameTradition * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array { diff --git a/app/SurnameTradition/PatrilinealSurnameTradition.php b/app/SurnameTradition/PatrilinealSurnameTradition.php index b64f407988..0eebd0f556 100644 --- a/app/SurnameTradition/PatrilinealSurnameTradition.php +++ b/app/SurnameTradition/PatrilinealSurnameTradition.php @@ -31,7 +31,7 @@ class PatrilinealSurnameTradition extends DefaultSurnameTradition * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -54,7 +54,7 @@ class PatrilinealSurnameTradition extends DefaultSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -72,12 +72,12 @@ class PatrilinealSurnameTradition extends DefaultSurnameTradition } /** - * @param string $name A name - * @param string[] $inflections A list of inflections + * @param string $name A name + * @param array<string,string> $inflections A list of inflections * * @return string An inflected name */ - protected function inflect($name, $inflections): string + protected function inflect(string $name, array $inflections): string { foreach ($inflections as $from => $to) { $name = preg_replace('~' . $from . '~u', $to, $name); diff --git a/app/SurnameTradition/PolishSurnameTradition.php b/app/SurnameTradition/PolishSurnameTradition.php index 938e290b29..e48224e7cc 100644 --- a/app/SurnameTradition/PolishSurnameTradition.php +++ b/app/SurnameTradition/PolishSurnameTradition.php @@ -47,7 +47,7 @@ class PolishSurnameTradition extends PaternalSurnameTradition * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -76,7 +76,7 @@ class PolishSurnameTradition extends PaternalSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -98,7 +98,7 @@ class PolishSurnameTradition extends PaternalSurnameTradition * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array { diff --git a/app/SurnameTradition/PortugueseSurnameTradition.php b/app/SurnameTradition/PortugueseSurnameTradition.php index 054570d320..ebc40f8d33 100644 --- a/app/SurnameTradition/PortugueseSurnameTradition.php +++ b/app/SurnameTradition/PortugueseSurnameTradition.php @@ -35,7 +35,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -63,7 +63,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -93,7 +93,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array { diff --git a/app/SurnameTradition/SpanishSurnameTradition.php b/app/SurnameTradition/SpanishSurnameTradition.php index 09d9f60bb7..b732cde395 100644 --- a/app/SurnameTradition/SpanishSurnameTradition.php +++ b/app/SurnameTradition/SpanishSurnameTradition.php @@ -35,7 +35,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array { @@ -63,7 +63,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array { @@ -93,7 +93,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array { diff --git a/app/SurnameTradition/SurnameTraditionInterface.php b/app/SurnameTradition/SurnameTraditionInterface.php index 5e14dd7e7d..92a9ef6191 100644 --- a/app/SurnameTradition/SurnameTraditionInterface.php +++ b/app/SurnameTradition/SurnameTraditionInterface.php @@ -46,7 +46,7 @@ interface SurnameTraditionInterface * @param string $mother_name A GEDCOM NAME * @param string $child_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newChildNames(string $father_name, string $mother_name, string $child_sex): array; @@ -56,7 +56,7 @@ interface SurnameTraditionInterface * @param string $child_name A GEDCOM NAME * @param string $parent_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newParentNames(string $child_name, string $parent_sex): array; @@ -66,7 +66,7 @@ interface SurnameTraditionInterface * @param string $spouse_name A GEDCOM NAME * @param string $spouse_sex M, F or U * - * @return string[] Associative array of GEDCOM name parts (SURN, _MARNM, etc.) + * @return array<string,string> Associative array of GEDCOM name parts (SURN, _MARNM, etc.) */ public function newSpouseNames(string $spouse_name, string $spouse_sex): array; } |