Consistent names for controlled-value constants

9 files changed, 43 insertions, 43 deletions

diff --git a/app/SurnameTradition/DefaultSurnameTradition.php b/app/SurnameTradition/DefaultSurnameTradition.php
index 50540d327e..63add19405 100644
--- a/app/SurnameTradition/DefaultSurnameTradition.php
+++ b/app/SurnameTradition/DefaultSurnameTradition.php
@@ -68,7 +68,7 @@ class DefaultSurnameTradition implements SurnameTraditionInterface
     public function newChildNames(?Individual $father, ?Individual $mother, string $sex): array
     {
         return [
-            $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -83,7 +83,7 @@ class DefaultSurnameTradition implements SurnameTraditionInterface
     public function newParentNames(Individual $child, string $sex): array
     {
         return [
-            $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -98,7 +98,7 @@ class DefaultSurnameTradition implements SurnameTraditionInterface
     public function newSpouseNames(Individual $spouse, string $sex): array
     {
         return [
-            $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -139,7 +139,7 @@ class DefaultSurnameTradition implements SurnameTraditionInterface
         if ($individual instanceof Individual) {
             $fact = $individual
                 ->facts(['NAME'])
-                ->first(fn (Fact $fact): bool => in_array($fact->attribute('TYPE'), ['', NameType::TYPE_BIRTH, NameType::TYPE_CHANGE], true));
+                ->first(fn (Fact $fact): bool => in_array($fact->attribute('TYPE'), ['', NameType::VALUE_BIRTH, NameType::VALUE_CHANGE], true));
 
             if ($fact instanceof Fact) {
                 return $fact->value();
diff --git a/app/SurnameTradition/IcelandicSurnameTradition.php b/app/SurnameTradition/IcelandicSurnameTradition.php
index 339c7a0bd8..9d6b5389a4 100644
--- a/app/SurnameTradition/IcelandicSurnameTradition.php
+++ b/app/SurnameTradition/IcelandicSurnameTradition.php
@@ -57,20 +57,20 @@ class IcelandicSurnameTradition extends DefaultSurnameTradition
                     $givn = $match['GIVN'] . 'sson';
 
                     return [
-                        $this->buildName($givn, ['TYPE' => NameType::TYPE_BIRTH, 'GIVN' => $givn]),
+                        $this->buildName($givn, ['TYPE' => NameType::VALUE_BIRTH, 'GIVN' => $givn]),
                     ];
 
                 case 'F':
                     $givn = $match['GIVN'] . 'sdottir';
 
                     return [
-                        $this->buildName($givn, ['TYPE' => NameType::TYPE_BIRTH, 'GIVN' => $givn]),
+                        $this->buildName($givn, ['TYPE' => NameType::VALUE_BIRTH, 'GIVN' => $givn]),
                     ];
             }
         }
 
         return [
-            $this->buildName('', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -86,18 +86,18 @@ class IcelandicSurnameTradition extends DefaultSurnameTradition
     {
         if ($sex === 'M' && preg_match('~(?<GIVN>[^ /]+)(:?sson)$~', $this->extractName($child), $match)) {
             return [
-                $this->buildName($match['GIVN'], ['TYPE' => NameType::TYPE_BIRTH, 'GIVN' => $match['GIVN']]),
+                $this->buildName($match['GIVN'], ['TYPE' => NameType::VALUE_BIRTH, 'GIVN' => $match['GIVN']]),
             ];
         }
 
         if ($sex === 'F' && preg_match('~(?<GIVN>[^ /]+)(:?sdottir)$~', $this->extractName($child), $match)) {
             return [
-                $this->buildName($match['GIVN'], ['TYPE' => NameType::TYPE_BIRTH, 'GIVN' => $match['GIVN']]),
+                $this->buildName($match['GIVN'], ['TYPE' => NameType::VALUE_BIRTH, 'GIVN' => $match['GIVN']]),
             ];
         }
 
         return [
-            $this->buildName('', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -112,7 +112,7 @@ class IcelandicSurnameTradition extends DefaultSurnameTradition
     public function newSpouseNames(Individual $spouse, string $sex): array
     {
         return [
-            $this->buildName('', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 }
diff --git a/app/SurnameTradition/LithuanianSurnameTradition.php b/app/SurnameTradition/LithuanianSurnameTradition.php
index eec05e4f42..66f855a103 100644
--- a/app/SurnameTradition/LithuanianSurnameTradition.php
+++ b/app/SurnameTradition/LithuanianSurnameTradition.php
@@ -74,12 +74,12 @@ class LithuanianSurnameTradition extends PaternalSurnameTradition
             }
 
             return [
-                $this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SURN' => $surn]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SURN' => $surn]),
             ];
         }
 
         return [
-            $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -98,12 +98,12 @@ class LithuanianSurnameTradition extends PaternalSurnameTradition
             $surn = $this->inflect($match['SURN'], self::INFLECT_MALE);
 
             return [
-                $this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SURN' => $surn]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SURN' => $surn]),
             ];
         }
 
         return [
-            $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -122,13 +122,13 @@ class LithuanianSurnameTradition extends PaternalSurnameTradition
             $surn = $this->inflect($match['SURN'], self::INFLECT_MALE);
 
             return [
-                $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
-                $this->buildName($name, ['TYPE' => NameType::TYPE_MARRIED, 'SURN' => $surn]),
+                $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_MARRIED, 'SURN' => $surn]),
             ];
         }
 
         return [
-            $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 }
diff --git a/app/SurnameTradition/MatrilinealSurnameTradition.php b/app/SurnameTradition/MatrilinealSurnameTradition.php
index fc567c2499..7937118d59 100644
--- a/app/SurnameTradition/MatrilinealSurnameTradition.php
+++ b/app/SurnameTradition/MatrilinealSurnameTradition.php
@@ -44,7 +44,7 @@ class MatrilinealSurnameTradition extends DefaultSurnameTradition
             $surn = $match['SURN'];
 
             return [
-                $this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
             ];
         }
 
@@ -67,7 +67,7 @@ class MatrilinealSurnameTradition extends DefaultSurnameTradition
             $surn = $match['SURN'];
 
             return [
-                $this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
             ];
         }
 
diff --git a/app/SurnameTradition/PaternalSurnameTradition.php b/app/SurnameTradition/PaternalSurnameTradition.php
index edf37c429e..9f8faf9b3a 100644
--- a/app/SurnameTradition/PaternalSurnameTradition.php
+++ b/app/SurnameTradition/PaternalSurnameTradition.php
@@ -45,8 +45,8 @@ class PaternalSurnameTradition extends PatrilinealSurnameTradition
             $surn = $match['SURN'];
 
             return [
-                $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
-                $this->buildName($name, ['TYPE' => NameType::TYPE_MARRIED, 'SPFX' => $spfx, 'SURN' => $surn]),
+                $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_MARRIED, 'SPFX' => $spfx, 'SURN' => $surn]),
             ];
         }
 
@@ -69,8 +69,8 @@ class PaternalSurnameTradition extends PatrilinealSurnameTradition
             $surn = $match['SURN'];
 
             return [
-                $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
-                $this->buildName($name, ['TYPE' => NameType::TYPE_MARRIED, 'SPFX' => $spfx, 'SURN' => $surn]),
+                $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_MARRIED, 'SPFX' => $spfx, 'SURN' => $surn]),
             ];
         }
 
diff --git a/app/SurnameTradition/PatrilinealSurnameTradition.php b/app/SurnameTradition/PatrilinealSurnameTradition.php
index 6199d93f06..3d6f209bcc 100644
--- a/app/SurnameTradition/PatrilinealSurnameTradition.php
+++ b/app/SurnameTradition/PatrilinealSurnameTradition.php
@@ -44,7 +44,7 @@ class PatrilinealSurnameTradition extends DefaultSurnameTradition
             $surn = $match['SURN'];
 
             return [
-                $this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
             ];
         }
 
@@ -67,7 +67,7 @@ class PatrilinealSurnameTradition extends DefaultSurnameTradition
             $surn = $match['SURN'];
 
             return [
-                $this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SPFX' => $spfx, 'SURN' => $surn]),
             ];
         }
 
diff --git a/app/SurnameTradition/PolishSurnameTradition.php b/app/SurnameTradition/PolishSurnameTradition.php
index 246102d216..00d9245bfe 100644
--- a/app/SurnameTradition/PolishSurnameTradition.php
+++ b/app/SurnameTradition/PolishSurnameTradition.php
@@ -63,10 +63,10 @@ class PolishSurnameTradition extends PaternalSurnameTradition
 
             $surn = $this->inflect($match['SURN'], self::INFLECT_MALE);
 
-            return [$this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SURN' => $surn])];
+            return [$this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SURN' => $surn])];
         }
 
-        return [$this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH])];
+        return [$this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH])];
     }
 
     /**
@@ -84,11 +84,11 @@ class PolishSurnameTradition extends PaternalSurnameTradition
             $surn = $this->inflect($match['SURN'], self::INFLECT_MALE);
 
             return [
-                $this->buildName($name, ['TYPE' => NameType::TYPE_BIRTH, 'SURN' => $surn]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_BIRTH, 'SURN' => $surn]),
             ];
         }
 
-        return [$this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH])];
+        return [$this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH])];
     }
 
     /**
@@ -106,11 +106,11 @@ class PolishSurnameTradition extends PaternalSurnameTradition
             $surn = $this->inflect($match['SURN'], self::INFLECT_MALE);
 
             return [
-                $this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH]),
-                $this->buildName($name, ['TYPE' => NameType::TYPE_MARRIED, 'SURN' => $surn]),
+                $this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH]),
+                $this->buildName($name, ['TYPE' => NameType::VALUE_MARRIED, 'SURN' => $surn]),
             ];
         }
 
-        return [$this->buildName('//', ['TYPE' => NameType::TYPE_BIRTH])];
+        return [$this->buildName('//', ['TYPE' => NameType::VALUE_BIRTH])];
     }
 }
diff --git a/app/SurnameTradition/PortugueseSurnameTradition.php b/app/SurnameTradition/PortugueseSurnameTradition.php
index 7746354f09..3cd21f8aaf 100644
--- a/app/SurnameTradition/PortugueseSurnameTradition.php
+++ b/app/SurnameTradition/PortugueseSurnameTradition.php
@@ -66,7 +66,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition
 
         return [
             $this->buildName('/' . $father_surname . '/ /' . $mother_surname . '/', [
-                'TYPE' => NameType::TYPE_BIRTH,
+                'TYPE' => NameType::VALUE_BIRTH,
                 'SURN' => trim($father_surname . ',' . $mother_surname, ','),
             ]),
         ];
@@ -87,7 +87,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition
                 case 'M':
                     return [
                         $this->buildName('// /' . $match['SURN1'] . '/', [
-                            'TYPE' => NameType::TYPE_BIRTH,
+                            'TYPE' => NameType::VALUE_BIRTH,
                             'SURN' => $match['SURN1'],
                         ]),
                     ];
@@ -95,7 +95,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition
                 case 'F':
                     return [
                         $this->buildName('// /' . $match['SURN2'] . '/', [
-                            'TYPE' => NameType::TYPE_BIRTH,
+                            'TYPE' => NameType::VALUE_BIRTH,
                             'SURN' => $match['SURN2'],
                         ]),
                     ];
@@ -103,7 +103,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition
         }
 
         return [
-            $this->buildName('// //', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('// //', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -118,7 +118,7 @@ class PortugueseSurnameTradition extends DefaultSurnameTradition
     public function newSpouseNames(Individual $spouse, string $sex): array
     {
         return [
-            $this->buildName('// //', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('// //', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 }
diff --git a/app/SurnameTradition/SpanishSurnameTradition.php b/app/SurnameTradition/SpanishSurnameTradition.php
index 6cae0150be..394a9b1d96 100644
--- a/app/SurnameTradition/SpanishSurnameTradition.php
+++ b/app/SurnameTradition/SpanishSurnameTradition.php
@@ -66,7 +66,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition
 
         return [
             $this->buildName('/' . $father_surname . '/ /' . $mother_surname . '/', [
-                'TYPE' => NameType::TYPE_BIRTH,
+                'TYPE' => NameType::VALUE_BIRTH,
                 'SURN' => trim($father_surname . ',' . $mother_surname, ','),
             ]),
         ];
@@ -87,7 +87,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition
                 case 'M':
                     return [
                         $this->buildName('/' . $match['SURN1'] . '/ //', [
-                            'TYPE' => NameType::TYPE_BIRTH,
+                            'TYPE' => NameType::VALUE_BIRTH,
                             'SURN' => $match['SURN1'],
                         ]),
                     ];
@@ -95,7 +95,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition
                 case 'F':
                     return [
                         $this->buildName('/' . $match['SURN2'] . '/ //', [
-                            'TYPE' => NameType::TYPE_BIRTH,
+                            'TYPE' => NameType::VALUE_BIRTH,
                             'SURN' => $match['SURN2'],
                         ]),
                     ];
@@ -103,7 +103,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition
         }
 
         return [
-            $this->buildName('// //', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('// //', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 
@@ -118,7 +118,7 @@ class SpanishSurnameTradition extends DefaultSurnameTradition
     public function newSpouseNames(Individual $spouse, string $sex): array
     {
         return [
-            $this->buildName('// //', ['TYPE' => NameType::TYPE_BIRTH]),
+            $this->buildName('// //', ['TYPE' => NameType::VALUE_BIRTH]),
         ];
     }
 }