Code style

6 files changed, 1018 insertions, 788 deletions

diff --git a/app/GedcomCode/GedcomCodeAdop.php b/app/GedcomCode/GedcomCodeAdop.php
index 9ac7df6427..2dd38a28ff 100644
--- a/app/GedcomCode/GedcomCodeAdop.php
+++ b/app/GedcomCode/GedcomCodeAdop.php
@@ -49,32 +49,38 @@ class GedcomCodeAdop
 
         switch ($type) {
             case 'BOTH':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Adopted by both parents');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Adopted by both parents');
-                    default:
-                        return I18N::translate('Adopted by both parents');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Adopted by both parents');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Adopted by both parents');
+                }
+
+                return I18N::translate('Adopted by both parents');
+
             case 'HUSB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Adopted by father');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Adopted by father');
-                    default:
-                        return I18N::translate('Adopted by father');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Adopted by father');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Adopted by father');
                 }
+
+                return I18N::translate('Adopted by father');
+
             case 'WIFE':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Adopted by mother');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Adopted by mother');
-                    default:
-                        return I18N::translate('Adopted by mother');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Adopted by mother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Adopted by mother');
                 }
+
+                return I18N::translate('Adopted by mother');
+
             default:
                 return $type;
         }
diff --git a/app/GedcomCode/GedcomCodeName.php b/app/GedcomCode/GedcomCodeName.php
index dfcc758e2e..acfe5fb8e7 100644
--- a/app/GedcomCode/GedcomCodeName.php
+++ b/app/GedcomCode/GedcomCodeName.php
@@ -55,106 +55,122 @@ class GedcomCodeName
 
         switch ($type) {
             case 'adopted':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: The name given to a child by its adoptive parents */
-                        return I18N::translateContext('MALE', 'adopted name');
-                    case 'F':
-                        /* I18N: The name given to a child by its adoptive parents */
-                        return I18N::translateContext('FEMALE', 'adopted name');
-                    default:
-                        /* I18N: The name given to a child by its adoptive parents */
-                        return I18N::translate('adopted name');
+                if ($sex === 'M') {
+                    /* I18N: The name given to a child by its adoptive parents */
+                    return I18N::translateContext('MALE', 'adopted name');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: The name given to a child by its adoptive parents */
+                    return I18N::translateContext('FEMALE', 'adopted name');
+                }
+
+                /* I18N: The name given to a child by its adoptive parents */
+                return I18N::translate('adopted name');
+
             case 'aka':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */
-                        return I18N::translateContext('MALE', 'also known as');
-                    case 'F':
-                        /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */
-                        return I18N::translateContext('FEMALE', 'also known as');
-                    default:
-                        /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */
-                        return I18N::translate('also known as');
+                if ($sex === 'M') {
+                    /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */
+                    return I18N::translateContext('MALE', 'also known as');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */
+                    return I18N::translateContext('FEMALE', 'also known as');
+                }
+
+                /* I18N: The name by which an individual is also known. e.g. a professional name or a stage name */
+                return I18N::translate('also known as');
+
             case 'birth':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: The name given to an individual at their birth */
-                        return I18N::translateContext('MALE', 'birth name');
-                    case 'F':
-                        /* I18N: The name given to an individual at their birth */
-                        return I18N::translateContext('FEMALE', 'birth name');
-                    default:
-                        /* I18N: The name given to an individual at their birth */
-                        return I18N::translate('birth name');
+                if ($sex === 'M') {
+                    /* I18N: The name given to an individual at their birth */
+                    return I18N::translateContext('MALE', 'birth name');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: The name given to an individual at their birth */
+                    return I18N::translateContext('FEMALE', 'birth name');
+                }
+
+                /* I18N: The name given to an individual at their birth */
+                return I18N::translate('birth name');
+
             case 'change':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: A name chosen by an individual, to replace their existing name (whether legal or otherwise) */
-                        return I18N::translateContext('MALE', 'change of name');
-                    case 'F':
-                        /* I18N: A name chosen by an individual, to replace their existing name (whether legal or otherwise) */
-                        return I18N::translateContext('FEMALE', 'change of name');
-                    default:
-                        /* I18N: A name chosen by an individual, to replace their existing name (whether legal or otherwise) */
-                        return I18N::translate('change of name');
+                if ($sex === 'M') {
+                    /* I18N: A name chosen by an individual, to replace their existing name (whether legal or otherwise) */
+                    return I18N::translateContext('MALE', 'change of name');
+                }
+
+                if ($sex === 'F') {
+                    /* I18N: A name chosen by an individual, to replace their existing name (whether legal or otherwise) */
+                    return I18N::translateContext('FEMALE', 'change of name');
                 }
+
+                /* I18N: A name chosen by an individual, to replace their existing name (whether legal or otherwise) */
+                return I18N::translate('change of name');
+
             case 'estate':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: A name given to an individual, from the farm or estate on which they lived or worked */
-                        return I18N::translateContext('MALE', 'estate name');
-                    case 'F':
-                        /* I18N: A name given to an individual, from the farm or estate on which they lived or worked */
-                        return I18N::translateContext('FEMALE', 'estate name');
-                    default:
-                        /* I18N: A name given to an individual, from the farm or estate on which they lived or worked */
-                        return I18N::translate('estate name');
+                if ($sex === 'M') {
+                    /* I18N: A name given to an individual, from the farm or estate on which they lived or worked */
+                    return I18N::translateContext('MALE', 'estate name');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: A name given to an individual, from the farm or estate on which they lived or worked */
+                    return I18N::translateContext('FEMALE', 'estate name');
+                }
+
+                /* I18N: A name given to an individual, from the farm or estate on which they lived or worked */
+                return I18N::translate('estate name');
+
             case 'immigrant':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: A name taken on immigration - e.g. migrants to the USA frequently anglicized their names */
-                        return I18N::translateContext('MALE', 'immigration name');
-                    case 'F':
-                        /* I18N: A name taken on immigration - e.g. migrants to the USA frequently anglicized their names */
-                        return I18N::translateContext('FEMALE', 'immigration name');
-                    default:
-                        /* I18N: A name taken on immigration - e.g. migrants to the USA frequently anglicized their names */
-                        return I18N::translate('immigration name');
+                if ($sex === 'M') {
+                    /* I18N: A name taken on immigration - e.g. migrants to the USA frequently anglicized their names */
+                    return I18N::translateContext('MALE', 'immigration name');
+                }
+
+                if ($sex === 'F') {
+                    /* I18N: A name taken on immigration - e.g. migrants to the USA frequently anglicized their names */
+                    return I18N::translateContext('FEMALE', 'immigration name');
                 }
+
+                /* I18N: A name taken on immigration - e.g. migrants to the USA frequently anglicized their names */
+                return I18N::translate('immigration name');
+
             case 'maiden':
                 // Only women have “maiden” names!
-                return
-                    /* I18N: A woman’s name, before she marries (in cultures where women take their new husband’s name on marriage) */
-                    I18N::translate('maiden name');
+                /* I18N: A woman’s name, before she marries (in cultures where women take their new husband’s name on marriage) */
+                return I18N::translate('maiden name');
+
             case 'married':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: A name taken on marriage - usually the wife takes the husband’s surname */
-                        return I18N::translateContext('MALE', 'married name');
-                    case 'F':
-                        /* I18N: A name taken on marriage - usually the wife takes the husband’s surname */
-                        return I18N::translateContext('FEMALE', 'married name');
-                    default:
-                        /* I18N: A name taken on marriage - usually the wife takes the husband’s surname */
-                        return I18N::translate('married name');
+                if ($sex === 'M') {
+                    /* I18N: A name taken on marriage - usually the wife takes the husband’s surname */
+                    return I18N::translateContext('MALE', 'married name');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: A name taken on marriage - usually the wife takes the husband’s surname */
+                    return I18N::translateContext('FEMALE', 'married name');
+                }
+
+                /* I18N: A name taken on marriage - usually the wife takes the husband’s surname */
+                return I18N::translate('married name');
+
             case 'religious':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: A name taken when entering a religion or a religious order */
-                        return I18N::translateContext('MALE', 'religious name');
-                    case 'F':
-                        /* I18N: A name taken when entering a religion or a religious order */
-                        return I18N::translateContext('FEMALE', 'religious name');
-                    default:
-                        /* I18N: A name taken when entering a religion or a religious order */
-                        return I18N::translate('religious name');
+                if ($sex === 'M') {
+                    /* I18N: A name taken when entering a religion or a religious order */
+                    return I18N::translateContext('MALE', 'religious name');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: A name taken when entering a religion or a religious order */
+                    return I18N::translateContext('FEMALE', 'religious name');
+                }
+
+                /* I18N: A name taken when entering a religion or a religious order */
+                return I18N::translate('religious name');
+
             default:
                 return $type;
         }
diff --git a/app/GedcomCode/GedcomCodePedi.php b/app/GedcomCode/GedcomCodePedi.php
index 7d72126a1b..cb01c599f9 100644
--- a/app/GedcomCode/GedcomCodePedi.php
+++ b/app/GedcomCode/GedcomCodePedi.php
@@ -51,44 +51,52 @@ class GedcomCodePedi
 
         switch ($type) {
             case 'birth':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('Male pedigree', 'Birth');
-                    case 'F':
-                        return I18N::translateContext('Female pedigree', 'Birth');
-                    default:
-                        return I18N::translateContext('Pedigree', 'Birth');
+                if ($sex === 'M') {
+                    return I18N::translateContext('Male pedigree', 'Birth');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('Female pedigree', 'Birth');
+                }
+
+                return I18N::translateContext('Pedigree', 'Birth');
+
             case 'adopted':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('Male pedigree', 'Adopted');
-                    case 'F':
-                        return I18N::translateContext('Female pedigree', 'Adopted');
-                    default:
-                        return I18N::translateContext('Pedigree', 'Adopted');
+                if ($sex === 'M') {
+                    return I18N::translateContext('Male pedigree', 'Adopted');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('Female pedigree', 'Adopted');
+                }
+
+                return I18N::translateContext('Pedigree', 'Adopted');
+
             case 'foster':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('Male pedigree', 'Foster');
-                    case 'F':
-                        return I18N::translateContext('Female pedigree', 'Foster');
-                    default:
-                        return I18N::translateContext('Pedigree', 'Foster');
+                if ($sex === 'M') {
+                    return I18N::translateContext('Male pedigree', 'Foster');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('Female pedigree', 'Foster');
+                }
+
+                return I18N::translateContext('Pedigree', 'Foster');
+
             case 'sealing':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: “sealing” is a ceremony in the Mormon church. */
-                        return I18N::translateContext('Male pedigree', 'Sealing');
-                    case 'F':
-                        /* I18N: “sealing” is a ceremony in the Mormon church. */
-                        return I18N::translateContext('Female pedigree', 'Sealing');
-                    default:
-                        /* I18N: “sealing” is a ceremony in the Mormon church. */
-                        return I18N::translateContext('Pedigree', 'Sealing');
+                if ($sex === 'M') {
+                    /* I18N: “sealing” is a ceremony in the Mormon church. */
+                    return I18N::translateContext('Male pedigree', 'Sealing');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: “sealing” is a ceremony in the Mormon church. */
+                    return I18N::translateContext('Female pedigree', 'Sealing');
+                }
+
+                /* I18N: “sealing” is a ceremony in the Mormon church. */
+                return I18N::translateContext('Pedigree', 'Sealing');
+
             case 'rada':
                 // Not standard GEDCOM - a webtrees extension
                 // This is an arabic word which does not exist in other languages.
diff --git a/app/GedcomCode/GedcomCodeRela.php b/app/GedcomCode/GedcomCodeRela.php
index ce2b613a7f..e1806b30ba 100644
--- a/app/GedcomCode/GedcomCodeRela.php
+++ b/app/GedcomCode/GedcomCodeRela.php
@@ -81,218 +81,270 @@ class GedcomCodeRela
 
         switch ($type) {
             case 'attendant':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Attendant');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Attendant');
-                    default:
-                        return I18N::translate('Attendant');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Attendant');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Attendant');
+                }
+
+                return I18N::translate('Attendant');
+
             case 'attending':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Attending');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Attending');
-                    default:
-                        return I18N::translate('Attending');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Attending');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Attending');
                 }
+
+                return I18N::translate('Attending');
+
             case 'best_man':
                 // always male
                 return I18N::translate('Best man');
+
             case 'bridesmaid':
                 // always female
                 return I18N::translate('Bridesmaid');
+
             case 'buyer':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Buyer');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Buyer');
-                    default:
-                        return I18N::translate('Buyer');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Buyer');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Buyer');
                 }
+
+                return I18N::translate('Buyer');
+
             case 'circumciser':
                 // always male
                 return I18N::translate('Circumciser');
+
             case 'civil_registrar':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Civil registrar');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Civil registrar');
-                    default:
-                        return I18N::translate('Civil registrar');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Civil registrar');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Civil registrar');
+                }
+
+                return I18N::translate('Civil registrar');
+
             case 'employee':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Employee');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Employee');
-                    default:
-                        return I18N::translate('Employee');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Employee');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Employee');
                 }
+
+                return I18N::translate('Employee');
+
             case 'employer':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Employer');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Employer');
-                    default:
-                        return I18N::translate('Employer');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Employer');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Employer');
+                }
+
+                return I18N::translate('Employer');
+
             case 'foster_child':
                 // no sex implied
                 return I18N::translate('Foster child');
+
             case 'foster_father':
                 // always male
                 return I18N::translate('Foster father');
+
             case 'foster_mother':
                 // always female
                 return I18N::translate('Foster mother');
+
             case 'friend':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Friend');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Friend');
-                    default:
-                        return I18N::translate('Friend');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Friend');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Friend');
                 }
+
+                return I18N::translate('Friend');
+
             case 'godfather':
                 // always male
                 return I18N::translate('Godfather');
+
             case 'godmother':
                 // always female
                 return I18N::translate('Godmother');
+
             case 'godparent':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Godfather');
-                    case 'F':
-                        return I18N::translate('Godmother');
-                    default:
-                        return I18N::translate('Godparent');
+                if ($sex === 'M') {
+                    return I18N::translate('Godfather');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Godmother');
                 }
+
+                return I18N::translate('Godparent');
+
             case 'godson':
                 // always male
                 return I18N::translate('Godson');
+
             case 'goddaughter':
                 // always female
                 return I18N::translate('Goddaughter');
+
             case 'godchild':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Godson');
-                    case 'F':
-                        return I18N::translate('Goddaughter');
-                    default:
-                        return I18N::translate('Godchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Godson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Goddaughter');
+                }
+
+                return I18N::translate('Godchild');
+
             case 'guardian':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Guardian');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Guardian');
-                    default:
-                        return I18N::translate('Guardian');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Guardian');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Guardian');
                 }
+
+                return I18N::translate('Guardian');
+
             case 'informant':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Informant');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Informant');
-                    default:
-                        return I18N::translate('Informant');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Informant');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Informant');
                 }
+
+                return I18N::translate('Informant');
+
             case 'lodger':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Lodger');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Lodger');
-                    default:
-                        return I18N::translate('Lodger');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Lodger');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Lodger');
+                }
+
+                return I18N::translate('Lodger');
+
             case 'nanny':
                 // no sex implied
                 return I18N::translate('Nanny');
+
             case 'nurse':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Nurse');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Nurse');
-                    default:
-                        return I18N::translate('Nurse');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Nurse');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Nurse');
                 }
+
+                return I18N::translate('Nurse');
+
             case 'owner':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Owner');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Owner');
-                    default:
-                        return I18N::translate('Owner');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Owner');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Owner');
+                }
+
+                return I18N::translate('Owner');
+
             case 'priest':
                 // no sex implied
                 return I18N::translate('Priest');
+
             case 'rabbi':
                 // always male
                 return I18N::translate('Rabbi');
+
             case 'registry_officer':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Registry officer');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Registry officer');
-                    default:
-                        return I18N::translate('Registry officer');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Registry officer');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Registry officer');
                 }
+
+                return I18N::translate('Registry officer');
+
             case 'seller':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Seller');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Seller');
-                    default:
-                        return I18N::translate('Seller');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Seller');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Seller');
+                }
+
+                return I18N::translate('Seller');
+
             case 'servant':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Servant');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Servant');
-                    default:
-                        return I18N::translate('Servant');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Servant');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Servant');
                 }
+
+                return I18N::translate('Servant');
+
             case 'slave':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Slave');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Slave');
-                    default:
-                        return I18N::translate('Slave');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Slave');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Slave');
                 }
+
+                return I18N::translate('Slave');
+
             case 'ward':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Ward');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Ward');
-                    default:
-                        return I18N::translate('Ward');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Ward');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Ward');
+                }
+
+                return I18N::translate('Ward');
+
             case 'witness':
                 // Do we need separate male/female translations for this?
                 return I18N::translate('Witness');
+
             default:
                 return I18N::translate($type);
         }
diff --git a/app/GedcomTag.php b/app/GedcomTag.php
index 0531fd5d4c..79967d6d89 100644
--- a/app/GedcomTag.php
+++ b/app/GedcomTag.php
@@ -1085,96 +1085,114 @@ class GedcomTag
                 /* I18N: gedcom tag WWW (A web address / URL) */
                 return I18N::translate('URL');
             case '_ADOP_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Adoption of a son');
-                    case 'F':
-                        return I18N::translate('Adoption of a daughter');
-                    default:
-                        return I18N::translate('Adoption of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Adoption of a son');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Adoption of a daughter');
+                }
+
+                return I18N::translate('Adoption of a child');
+
             case '_ADOP_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Adoption of a grandson');
-                    case 'F':
-                        return I18N::translate('Adoption of a granddaughter');
-                    default:
-                        return I18N::translate('Adoption of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Adoption of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Adoption of a granddaughter');
                 }
+
+                return I18N::translate('Adoption of a grandchild');
+
             case '_ADOP_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Adoption of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Adoption of a granddaughter');
-                    default:
-                        return I18N::translate('Adoption of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Adoption of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Adoption of a granddaughter');
                 }
+
+                return I18N::translate('Adoption of a grandchild');
+
             case '_ADOP_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Adoption of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Adoption of a granddaughter');
-                    default:
-                        return I18N::translate('Adoption of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Adoption of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Adoption of a granddaughter');
+                }
+
+                return I18N::translate('Adoption of a grandchild');
+
             case '_ADOP_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Adoption of a half-brother');
-                    case 'F':
-                        return I18N::translate('Adoption of a half-sister');
-                    default:
-                        return I18N::translate('Adoption of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Adoption of a half-brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Adoption of a half-sister');
                 }
+
+                return I18N::translate('Adoption of a half-sibling');
+
             case '_ADOP_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Adoption of a brother');
-                    case 'F':
-                        return I18N::translate('Adoption of a sister');
-                    default:
-                        return I18N::translate('Adoption of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Adoption of a brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Adoption of a sister');
                 }
+
+                return I18N::translate('Adoption of a sibling');
+
             case '_ADPF':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: gedcom tag _ADPF */
-                        return I18N::translateContext('MALE', 'Adopted by father');
-                    case 'F':
-                        /* I18N: gedcom tag _ADPF */
-                        return I18N::translateContext('FEMALE', 'Adopted by father');
-                    default:
-                        /* I18N: gedcom tag _ADPF */
-                        return I18N::translate('Adopted by father');
+                if ($sex === 'M') {
+                    /* I18N: gedcom tag _ADPF */
+                    return I18N::translateContext('MALE', 'Adopted by father');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: gedcom tag _ADPF */
+                    return I18N::translateContext('FEMALE', 'Adopted by father');
+                }
+
+                /* I18N: gedcom tag _ADPF */
+                return I18N::translate('Adopted by father');
+
             case '_ADPM':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: gedcom tag _ADPM */
-                        return I18N::translateContext('MALE', 'Adopted by mother');
-                    case 'F':
-                        /* I18N: gedcom tag _ADPM */
-                        return I18N::translateContext('FEMALE', 'Adopted by mother');
-                    default:
-                        /* I18N: gedcom tag _ADPM */
-                        return I18N::translate('Adopted by mother');
+                if ($sex === 'M') {
+                    /* I18N: gedcom tag _ADPM */
+                    return I18N::translateContext('MALE', 'Adopted by mother');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: gedcom tag _ADPM */
+                    return I18N::translateContext('FEMALE', 'Adopted by mother');
+                }
+
+                /* I18N: gedcom tag _ADPM */
+                return I18N::translate('Adopted by mother');
+
             case '_AKA':
             case '_AKAN':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: gedcom tag _AKA */
-                        return I18N::translateContext('MALE', 'Also known as');
-                    case 'F':
-                        /* I18N: gedcom tag _AKA */
-                        return I18N::translateContext('FEMALE', 'Also known as');
-                    default:
-                        /* I18N: gedcom tag _AKA */
-                        return I18N::translate('Also known as');
+                if ($sex === 'M') {
+                    /* I18N: gedcom tag _AKA */
+                    return I18N::translateContext('MALE', 'Also known as');
                 }
+
+                if ($sex === 'F') {
+                    /* I18N: gedcom tag _AKA */
+                    return I18N::translateContext('FEMALE', 'Also known as');
+                }
+
+                /* I18N: gedcom tag _AKA */
+                return I18N::translate('Also known as');
+
             case '_ALBUM':
                 // Family Tree Builder uses OBJE:_ALBUM
                 /* I18N: gedcom tag _ALBUM */
@@ -1183,116 +1201,141 @@ class GedcomTag
                 /* I18N: gedcom tag _ASSO */
                 return I18N::translate('Associate');
             case '_BAPM_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Baptism of a son');
-                    case 'F':
-                        return I18N::translate('Baptism of a daughter');
-                    default:
-                        return I18N::translate('Baptism of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Baptism of a son');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Baptism of a daughter');
+                }
+
+                return I18N::translate('Baptism of a child');
+
             case '_BAPM_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Baptism of a grandson');
-                    case 'F':
-                        return I18N::translate('Baptism of a granddaughter');
-                    default:
-                        return I18N::translate('Baptism of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Baptism of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Baptism of a granddaughter');
                 }
+
+                return I18N::translate('Baptism of a grandchild');
+
             case '_BAPM_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Baptism of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Baptism of a granddaughter');
-                    default:
-                        return I18N::translate('Baptism of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Baptism of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Baptism of a granddaughter');
                 }
+
+                return I18N::translate('Baptism of a grandchild');
+
             case '_BAPM_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Baptism of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Baptism of a granddaughter');
-                    default:
-                        return I18N::translate('Baptism of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Baptism of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Baptism of a granddaughter');
+                }
+
+                return I18N::translate('Baptism of a grandchild');
+
             case '_BAPM_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Baptism of a half-brother');
-                    case 'F':
-                        return I18N::translate('Baptism of a half-sister');
-                    default:
-                        return I18N::translate('Baptism of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Baptism of a half-brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Baptism of a half-sister');
                 }
+
+                return I18N::translate('Baptism of a half-sibling');
+
             case '_BAPM_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Baptism of a brother');
-                    case 'F':
-                        return I18N::translate('Baptism of a sister');
-                    default:
-                        return I18N::translate('Baptism of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Baptism of a brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Baptism of a sister');
                 }
+
+                return I18N::translate('Baptism of a sibling');
+
             case '_BIBL':
                 /* I18N: gedcom tag _BIBL */
                 return I18N::translate('Bibliography');
+
             case '_BIRT_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Birth of a son');
-                    case 'F':
-                        return I18N::translate('Birth of a daughter');
-                    default:
-                        return I18N::translate('Birth of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Birth of a son');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Birth of a daughter');
                 }
+
+                return I18N::translate('Birth of a child');
+
             case '_BIRT_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Birth of a grandson');
-                    case 'F':
-                        return I18N::translate('Birth of a granddaughter');
-                    default:
-                        return I18N::translate('Birth of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Birth of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Birth of a granddaughter');
                 }
+
+                return I18N::translate('Birth of a grandchild');
+
             case '_BIRT_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Birth of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Birth of a granddaughter');
-                    default:
-                        return I18N::translate('Birth of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Birth of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Birth of a granddaughter');
+                }
+
+                return I18N::translate('Birth of a grandchild');
+
             case '_BIRT_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Birth of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Birth of a granddaughter');
-                    default:
-                        return I18N::translate('Birth of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Birth of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Birth of a granddaughter');
+                }
+
+                return I18N::translate('Birth of a grandchild');
+
             case '_BIRT_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Birth of a half-brother');
-                    case 'F':
-                        return I18N::translate('Birth of a half-sister');
-                    default:
-                        return I18N::translate('Birth of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Birth of a half-brother');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Birth of a half-sister');
+                }
+
+                return I18N::translate('Birth of a half-sibling');
+
             case '_BIRT_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Birth of a brother');
-                    case 'F':
-                        return I18N::translate('Birth of a sister');
-                    default:
-                        return I18N::translate('Birth of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Birth of a brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Birth of a sister');
                 }
+
+                return I18N::translate('Birth of a sibling');
+
             case '_BRTM':
                 /* I18N: gedcom tag _BRTM */
                 return I18N::translate('Brit milah');
@@ -1301,362 +1344,442 @@ class GedcomTag
             case '_BRTM:PLAC':
                 return I18N::translate('Place of brit milah');
             case '_BURI_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a son');
-                    case 'F':
-                        return I18N::translate('Burial of a daughter');
-                    default:
-                        return I18N::translate('Burial of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a son');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a daughter');
                 }
+
+                return I18N::translate('Burial of a child');
+
             case '_BURI_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a grandson');
-                    case 'F':
-                        return I18N::translate('Burial of a granddaughter');
-                    default:
-                        return I18N::translate('Burial of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a granddaughter');
                 }
+
+                return I18N::translate('Burial of a grandchild');
+
             case '_BURI_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Burial of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Burial of a granddaughter');
-                    default:
-                        return I18N::translate('Burial of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Burial of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Burial of a granddaughter');
+                }
+
+                return I18N::translate('Burial of a grandchild');
+
             case '_BURI_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Burial of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Burial of a granddaughter');
-                    default:
-                        return I18N::translate('Burial of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Burial of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Burial of a granddaughter');
                 }
+
+                return I18N::translate('Burial of a grandchild');
+
             case '_BURI_GPAR':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a grandfather');
-                    case 'F':
-                        return I18N::translate('Burial of a grandmother');
-                    default:
-                        return I18N::translate('Burial of a grandparent');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a grandfather');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a grandmother');
                 }
+
+                return I18N::translate('Burial of a grandparent');
+
             case '_BURI_GPA1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a paternal grandfather');
-                    case 'F':
-                        return I18N::translate('Burial of a paternal grandmother');
-                    default:
-                        return I18N::translate('Burial of a paternal grandparent');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a paternal grandfather');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a paternal grandmother');
+                }
+
+                return I18N::translate('Burial of a paternal grandparent');
+
             case '_BURI_GPA2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a maternal grandfather');
-                    case 'F':
-                        return I18N::translate('Burial of a maternal grandmother');
-                    default:
-                        return I18N::translate('Burial of a maternal grandparent');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a maternal grandfather');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a maternal grandmother');
+                }
+
+                return I18N::translate('Burial of a maternal grandparent');
+
             case '_BURI_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a half-brother');
-                    case 'F':
-                        return I18N::translate('Burial of a half-sister');
-                    default:
-                        return I18N::translate('Burial of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a half-brother');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a half-sister');
+                }
+
+                return I18N::translate('Burial of a half-sibling');
+
             case '_BURI_PARE':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a father');
-                    case 'F':
-                        return I18N::translate('Burial of a mother');
-                    default:
-                        return I18N::translate('Burial of a parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a father');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a mother');
                 }
+
+                return I18N::translate('Burial of a parent');
+
             case '_BURI_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a brother');
-                    case 'F':
-                        return I18N::translate('Burial of a sister');
-                    default:
-                        return I18N::translate('Burial of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a sister');
                 }
+
+                return I18N::translate('Burial of a sibling');
+
             case '_BURI_SPOU':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Burial of a husband');
-                    case 'F':
-                        return I18N::translate('Burial of a wife');
-                    default:
-                        return I18N::translate('Burial of a spouse');
+                if ($sex === 'M') {
+                    return I18N::translate('Burial of a husband');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Burial of a wife');
                 }
+
+                return I18N::translate('Burial of a spouse');
+
             case '_CHR_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Christening of a son');
-                    case 'F':
-                        return I18N::translate('Christening of a daughter');
-                    default:
-                        return I18N::translate('Christening of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Christening of a son');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Christening of a daughter');
+                }
+
+                return I18N::translate('Christening of a child');
+
             case '_CHR_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Christening of a grandson');
-                    case 'F':
-                        return I18N::translate('Christening of a granddaughter');
-                    default:
-                        return I18N::translate('Christening of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Christening of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Christening of a granddaughter');
                 }
+
+                return I18N::translate('Christening of a grandchild');
+
             case '_CHR_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Christening of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Christening of a granddaughter');
-                    default:
-                        return I18N::translate('Christening of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Christening of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Christening of a granddaughter');
                 }
+
+                return I18N::translate('Christening of a grandchild');
+
             case '_CHR_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Christening of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Christening of a granddaughter');
-                    default:
-                        return I18N::translate('Christening of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Christening of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Christening of a granddaughter');
+                }
+
+                return I18N::translate('Christening of a grandchild');
+
             case '_CHR_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Christening of a half-brother');
-                    case 'F':
-                        return I18N::translate('Christening of a half-sister');
-                    default:
-                        return I18N::translate('Christening of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Christening of a half-brother');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Christening of a half-sister');
+                }
+
+                return I18N::translate('Christening of a half-sibling');
+
             case '_CHR_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Christening of a brother');
-                    case 'F':
-                        return I18N::translate('Christening of a sister');
-                    default:
-                        return I18N::translate('Christening of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Christening of a brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Christening of a sister');
                 }
+
+                return I18N::translate('Christening of a sibling');
+
             case '_COML':
                 /* I18N: gedcom tag _COML */
                 return I18N::translate('Common law marriage');
+
             case '_CREM_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a son');
-                    case 'F':
-                        return I18N::translate('Cremation of a daughter');
-                    default:
-                        return I18N::translate('Cremation of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a son');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a daughter');
+                }
+
+                return I18N::translate('Cremation of a child');
+
             case '_CREM_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a grandson');
-                    case 'F':
-                        return I18N::translate('Cremation of a granddaughter');
-                    default:
-                        return I18N::translate('Cremation of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a granddaughter');
                 }
+
+                return I18N::translate('Cremation of a grandchild');
+
             case '_CREM_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Cremation of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Cremation of a granddaughter');
-                    default:
-                        return I18N::translate('Cremation of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Cremation of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Cremation of a granddaughter');
                 }
+
+                return I18N::translate('Cremation of a grandchild');
+
             case '_CREM_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Cremation of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Cremation of a granddaughter');
-                    default:
-                        return I18N::translate('Cremation of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Cremation of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Cremation of a granddaughter');
+                }
+
+                return I18N::translate('Cremation of a grandchild');
+
             case '_CREM_GPAR':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a grandfather');
-                    case 'F':
-                        return I18N::translate('Cremation of a grandmother');
-                    default:
-                        return I18N::translate('Cremation of a grand-parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a grandfather');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a grandmother');
                 }
+
+                return I18N::translate('Cremation of a grand-parent');
+
             case '_CREM_GPA1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a paternal grandfather');
-                    case 'F':
-                        return I18N::translate('Cremation of a paternal grandmother');
-                    default:
-                        return I18N::translate('Cremation of a grand-parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a paternal grandfather');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a paternal grandmother');
                 }
+
+                return I18N::translate('Cremation of a grand-parent');
+
             case '_CREM_GPA2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a maternal grandfather');
-                    case 'F':
-                        return I18N::translate('Cremation of a maternal grandmother');
-                    default:
-                        return I18N::translate('Cremation of a grand-parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a maternal grandfather');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a maternal grandmother');
+                }
+
+                return I18N::translate('Cremation of a grand-parent');
+
             case '_CREM_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a half-brother');
-                    case 'F':
-                        return I18N::translate('Cremation of a half-sister');
-                    default:
-                        return I18N::translate('Cremation of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a half-brother');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a half-sister');
+                }
+
+                return I18N::translate('Cremation of a half-sibling');
+
             case '_CREM_PARE':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a father');
-                    case 'F':
-                        return I18N::translate('Cremation of a mother');
-                    default:
-                        return I18N::translate('Cremation of a parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a father');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a mother');
+                }
+
+                return I18N::translate('Cremation of a parent');
+
             case '_CREM_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a brother');
-                    case 'F':
-                        return I18N::translate('Cremation of a sister');
-                    default:
-                        return I18N::translate('Cremation of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a sister');
                 }
+
+                return I18N::translate('Cremation of a sibling');
+
             case '_CREM_SPOU':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Cremation of a husband');
-                    case 'F':
-                        return I18N::translate('Cremation of a wife');
-                    default:
-                        return I18N::translate('Cremation of a spouse');
+                if ($sex === 'M') {
+                    return I18N::translate('Cremation of a husband');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Cremation of a wife');
                 }
+
+                return I18N::translate('Cremation of a spouse');
+
             case '_DBID':
                 /* I18N: gedcom tag _DBID */
                 return I18N::translate('Linked database ID');
+
             case '_DEAT_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a son');
-                    case 'F':
-                        return I18N::translate('Death of a daughter');
-                    default:
-                        return I18N::translate('Death of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a son');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a daughter');
                 }
+
+                return I18N::translate('Death of a child');
+
             case '_DEAT_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a grandson');
-                    case 'F':
-                        return I18N::translate('Death of a granddaughter');
-                    default:
-                        return I18N::translate('Death of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a granddaughter');
                 }
+
+                return I18N::translate('Death of a grandchild');
+
             case '_DEAT_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Death of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Death of a granddaughter');
-                    default:
-                        return I18N::translate('Death of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Death of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Death of a granddaughter');
                 }
+
+                return I18N::translate('Death of a grandchild');
+
             case '_DEAT_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Death of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Death of a granddaughter');
-                    default:
-                        return I18N::translate('Death of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Death of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Death of a granddaughter');
+                }
+
+                return I18N::translate('Death of a grandchild');
+
             case '_DEAT_GPAR':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a grandfather');
-                    case 'F':
-                        return I18N::translate('Death of a grandmother');
-                    default:
-                        return I18N::translate('Death of a grand-parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a grandfather');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a grandmother');
                 }
+
+                return I18N::translate('Death of a grand-parent');
+
             case '_DEAT_GPA1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a paternal grandfather');
-                    case 'F':
-                        return I18N::translate('Death of a paternal grandmother');
-                    default:
-                        return I18N::translate('Death of a grand-parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a paternal grandfather');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a paternal grandmother');
                 }
+
+                return I18N::translate('Death of a grand-parent');
+
             case '_DEAT_GPA2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a maternal grandfather');
-                    case 'F':
-                        return I18N::translate('Death of a maternal grandmother');
-                    default:
-                        return I18N::translate('Death of a grand-parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a maternal grandfather');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a maternal grandmother');
+                }
+
+                return I18N::translate('Death of a grand-parent');
+
             case '_DEAT_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a half-brother');
-                    case 'F':
-                        return I18N::translate('Death of a half-sister');
-                    default:
-                        return I18N::translate('Death of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a half-brother');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a half-sister');
+                }
+
+                return I18N::translate('Death of a half-sibling');
+
             case '_DEAT_PARE':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a father');
-                    case 'F':
-                        return I18N::translate('Death of a mother');
-                    default:
-                        return I18N::translate('Death of a parent');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a father');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a mother');
+                }
+
+                return I18N::translate('Death of a parent');
+
             case '_DEAT_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a brother');
-                    case 'F':
-                        return I18N::translate('Death of a sister');
-                    default:
-                        return I18N::translate('Death of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a sister');
                 }
+
+                return I18N::translate('Death of a sibling');
+
             case '_DEAT_SPOU':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Death of a husband');
-                    case 'F':
-                        return I18N::translate('Death of a wife');
-                    default:
-                        return I18N::translate('Death of a spouse');
+                if ($sex === 'M') {
+                    return I18N::translate('Death of a husband');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Death of a wife');
                 }
+
+                return I18N::translate('Death of a spouse');
+
             case '_DEG':
                 /* I18N: gedcom tag _DEG */
                 return I18N::translate('Degree');
@@ -1725,18 +1848,21 @@ class GedcomTag
             case '_HOL':
                 /* I18N: gedcom tag _HOL */
                 return I18N::translate('Holocaust');
+
             case '_INTE':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: gedcom tag _INTE */
-                        return I18N::translateContext('MALE', 'Interred');
-                    case 'F':
-                        /* I18N: gedcom tag _INTE */
-                        return I18N::translateContext('FEMALE', 'Interred');
-                    default:
-                        /* I18N: gedcom tag _INTE */
-                        return I18N::translate('Interred');
+                if ($sex === 'M') {
+                    /* I18N: gedcom tag _INTE */
+                    return I18N::translateContext('MALE', 'Interred');
+                }
+
+                if ($sex === 'F') {
+                    /* I18N: gedcom tag _INTE */
+                    return I18N::translateContext('FEMALE', 'Interred');
                 }
+
+                /* I18N: gedcom tag _INTE */
+                return I18N::translate('Interred');
+
             case '_LOC':
                 /* I18N: gedcom tag _LOC */
                 return I18N::translate('Location');
@@ -1751,75 +1877,91 @@ class GedcomTag
                 return I18N::translate('Highlighted image');
             case '_MARNM_SURN':
                 return I18N::translate('Married surname');
+
             case '_MARR_CHIL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Marriage of a son');
-                    case 'F':
-                        return I18N::translate('Marriage of a daughter');
-                    default:
-                        return I18N::translate('Marriage of a child');
+                if ($sex === 'M') {
+                    return I18N::translate('Marriage of a son');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Marriage of a daughter');
+                }
+
+                return I18N::translate('Marriage of a child');
+
             case '_MARR_FAMC':
                 /* I18N: ...to each other */
                 return I18N::translate('Marriage of parents');
+
             case '_MARR_GCHI':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Marriage of a grandson');
-                    case 'F':
-                        return I18N::translate('Marriage of a granddaughter');
-                    default:
-                        return I18N::translate('Marriage of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translate('Marriage of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Marriage of a granddaughter');
+                }
+
+                return I18N::translate('Marriage of a grandchild');
+
             case '_MARR_GCH1':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('daughter’s son', 'Marriage of a grandson');
-                    case 'F':
-                        return I18N::translateContext('daughter’s daughter', 'Marriage of a granddaughter');
-                    default:
-                        return I18N::translate('Marriage of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('daughter’s son', 'Marriage of a grandson');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('daughter’s daughter', 'Marriage of a granddaughter');
+                }
+
+                return I18N::translate('Marriage of a grandchild');
+
             case '_MARR_GCH2':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('son’s son', 'Marriage of a grandson');
-                    case 'F':
-                        return I18N::translateContext('son’s daughter', 'Marriage of a granddaughter');
-                    default:
-                        return I18N::translate('Marriage of a grandchild');
+                if ($sex === 'M') {
+                    return I18N::translateContext('son’s son', 'Marriage of a grandson');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('son’s daughter', 'Marriage of a granddaughter');
                 }
+
+                return I18N::translate('Marriage of a grandchild');
+
             case '_MARR_HSIB':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Marriage of a half-brother');
-                    case 'F':
-                        return I18N::translate('Marriage of a half-sister');
-                    default:
-                        return I18N::translate('Marriage of a half-sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Marriage of a half-brother');
+                }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Marriage of a half-sister');
                 }
+
+                return I18N::translate('Marriage of a half-sibling');
+
             case '_MARR_PARE':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: ...to another spouse */
-                        return I18N::translate('Marriage of a father');
-                    case 'F':
-                        /* I18N: ...to another spouse */
-                        return I18N::translate('Marriage of a mother');
-                    default:
-                        /* I18N: ...to another spouse */
-                        return I18N::translate('Marriage of a parent');
+                if ($sex === 'M') {
+                    /* I18N: ...to another spouse */
+                    return I18N::translate('Marriage of a father');
+                }
+
+                if ($sex ===  'F') {
+                    /* I18N: ...to another spouse */
+                    return I18N::translate('Marriage of a mother');
                 }
+
+                /* I18N: ...to another spouse */
+                return I18N::translate('Marriage of a parent');
+
             case '_MARR_SIBL':
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translate('Marriage of a brother');
-                    case 'F':
-                        return I18N::translate('Marriage of a sister');
-                    default:
-                        return I18N::translate('Marriage of a sibling');
+                if ($sex === 'M') {
+                    return I18N::translate('Marriage of a brother');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translate('Marriage of a sister');
+                }
+
+                return I18N::translate('Marriage of a sibling');
+
             case '_MBON':
                 /* I18N: gedcom tag _MBON */
                 return I18N::translate('Marriage bond');
@@ -1854,29 +1996,33 @@ class GedcomTag
                 /* I18N: gedcom tag _NLIV */
                 return I18N::translate('Not living');
             case '_NMAR':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: gedcom tag _NMAR */
-                        return I18N::translateContext('MALE', 'Never married');
-                    case 'F':
-                        /* I18N: gedcom tag _NMAR */
-                        return I18N::translateContext('FEMALE', 'Never married');
-                    default:
-                        /* I18N: gedcom tag _NMAR */
-                        return I18N::translate('Never married');
+                if ($sex === 'M') {
+                    /* I18N: gedcom tag _NMAR */
+                    return I18N::translateContext('MALE', 'Never married');
+                }
+
+                if ($sex === 'F') {
+                    /* I18N: gedcom tag _NMAR */
+                    return I18N::translateContext('FEMALE', 'Never married');
                 }
+
+                /* I18N: gedcom tag _NMAR */
+                return I18N::translate('Never married');
+
             case '_NMR':
-                switch ($sex) {
-                    case 'M':
-                        /* I18N: gedcom tag _NMR */
-                        return I18N::translateContext('MALE', 'Not married');
-                    case 'F':
-                        /* I18N: gedcom tag _NMR */
-                        return I18N::translateContext('FEMALE', 'Not married');
-                    default:
-                        /* I18N: gedcom tag _NMR */
-                        return I18N::translate('Not married');
+                if ($sex === 'M') {
+                    /* I18N: gedcom tag _NMR */
+                    return I18N::translateContext('MALE', 'Not married');
+                }
+
+                if ($sex === 'F') {
+                    /* I18N: gedcom tag _NMR */
+                    return I18N::translateContext('FEMALE', 'Not married');
                 }
+
+                /* I18N: gedcom tag _NMR */
+                return I18N::translate('Not married');
+
             case '_PHOTO':
                 // Family Tree Builder uses "0 _ALBUM/1_PHOTO"
                 return I18N::translate('Photo');
@@ -1887,14 +2033,16 @@ class GedcomTag
                 return I18N::translate('Permanent number');
             case '_RNAME':
                 // Family Tree Builder user "1 NAME / 2 _RNAME"
-                switch ($sex) {
-                    case 'M':
-                        return I18N::translateContext('MALE', 'Religious name');
-                    case 'F':
-                        return I18N::translateContext('FEMALE', 'Religious name');
-                    default:
-                        return I18N::translate('Religious name');
+                if ($sex === 'M') {
+                    return I18N::translateContext('MALE', 'Religious name');
                 }
+
+                if ($sex === 'F') {
+                    return I18N::translateContext('FEMALE', 'Religious name');
+                }
+
+                return I18N::translate('Religious name');
+
             case '_SCBK':
                 /* I18N: gedcom tag _SCBK */
                 return I18N::translate('Scrapbook');
diff --git a/composer.json b/composer.json
index 792f39c600..468181b4d9 100644
--- a/composer.json
+++ b/composer.json
@@ -81,9 +81,9 @@
             "### PHP-PARALLEL-LINT",
             "parallel-lint --no-progress --exclude vendor .",
             "### PHP-CODE-SNIFFER",
-            "phpcs --standard=PSR12 -s --exclude=Generic.Files.LineLength,PSR2.ControlStructures.ControlStructureSpacing,PSR2.ControlStructures.SwitchDeclaration app routes",
+            "phpcs --standard=PSR12 -s --exclude=Generic.Files.LineLength,PSR2.ControlStructures.ControlStructureSpacing app routes",
             "### PHAN",
-            "phan --directory . --exclude-directory-list data,resources,routes,tests,vendor",
+            "phan --target-php-version=7.0 --processes=64 --directory . --exclude-directory-list data,resources,routes,tests,vendor",
             "### PHPSTAN",
             "phpstan --level=7 analyze app",
             "### PSALM",