fix: United Kingdom test and minor changes

loophp · Jun 6, 2024 · ec2c3f1 · ec2c3f1
1 parent f86b0b6
commit ec2c3f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/spec/loophp/Tin/CountryHandler/UnitedKingdomSpec.php b/spec/loophp/Tin/CountryHandler/UnitedKingdomSpec.php
@@ -13,9 +13,9 @@
 
 class UnitedKingdomSpec extends AbstractAlgorithmSpec
 {
-    public const INVALID_NUMBER_LENGTH = '12345678901';
+    public const INVALID_NUMBER_LENGTH = [ 'wwwwwwww', '12345678901' ];
 
-    public const INVALID_NUMBER_PATTERN = ['wwwwwwww', 'GB123456A'];
+    public const INVALID_NUMBER_PATTERN = ['wwwwwwwww', 'GB123456A'];
 
     public const VALID_NUMBER = ['1234567890', 'AA123456A'];
 }
diff --git a/src/CountryHandler/UnitedKingdom.php b/src/CountryHandler/UnitedKingdom.php
@@ -43,13 +43,7 @@ final class UnitedKingdom extends CountryHandler
 
     public function getTIN(): string
     {
-        $tin = parent::getTIN();
-
-        if (8 === strlen($tin)) {
-            $tin .= ' ';
-        }
-
-        return $tin;
+        return str_pad($this->normalizeTin(parent::getTIN()), 9, ' ', STR_PAD_RIGHT);
     }
 
     protected function hasValidLength(string $tin): bool
@@ -63,7 +57,11 @@ protected function hasValidPattern(string $tin): bool
             return false;
         }
 
-        return !($this->isFollowLength2($tin) && !$this->isFollowPattern2($tin));
+        if ($this->isFollowLength2($tin) && !$this->isFollowPattern2($tin)) {
+            return false;
+        }
+
+        return true;
     }
 
     private function isFollowLength1(string $tin): bool