fix: do not alter the TIN value when calling getTin()

Fix #39
loophp · Jun 6, 2024 · b2cbb19 · b2cbb19
1 parent 39e5f92
commit b2cbb19
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/CountryHandler/CountryHandler.php b/src/CountryHandler/CountryHandler.php
@@ -33,11 +33,7 @@ final public function __construct(string $tin = '')
 
     public function getTIN(): string
     {
-        if (null !== $string = preg_replace('#[^[:alnum:]\-+]#u', '', $this->tin)) {
-            return strtoupper($string);
-        }
-
-        return '';
+        return $this->tin;
     }
 
     final public static function supports(string $country): bool
@@ -47,7 +43,7 @@ final public static function supports(string $country): bool
 
     final public function validate(): bool
     {
-        $tin = $this->getTIN();
+        $tin = $this->normalizeTin($this->getTIN());
 
         if (!$this->hasValidLength($tin)) {
             throw TINException::invalidLength($this->tin);
@@ -116,6 +112,15 @@ protected function getLastDigit(int $number): int
         return (int) end($split);
     }
 
+    protected function normalizeTin(string $tin): string
+    {
+        if (null !== $string = preg_replace('#[^[:alnum:]\-+]#u', '', $tin)) {
+            return strtoupper($string);
+        }
+
+        return '';
+    }
+
     protected function hasValidDate(string $tin): bool
     {
         return true;
@@ -126,12 +131,12 @@ protected function hasValidDate(string $tin): bool
      */
     protected function hasValidLength(string $tin): bool
     {
-        return $this->matchLength($this->getTIN(), static::LENGTH);
+        return $this->matchLength($this->normalizeTin($tin), static::LENGTH);
     }
 
     protected function hasValidPattern(string $tin): bool
     {
-        return $this->matchPattern($this->getTIN(), static::PATTERN);
+        return $this->matchPattern($this->normalizeTin($tin), static::PATTERN);
     }
 
     protected function hasValidRule(string $tin): bool
@@ -141,7 +146,7 @@ protected function hasValidRule(string $tin): bool
 
     protected function matchLength(string $tin, int $length): bool
     {
-        return strlen($tin) === $length;
+        return strlen($this->normalizeTin($tin)) === $length;
     }
 
     protected function matchPattern(string $subject, string $pattern): bool

diff --git a/src/CountryHandler/Ireland.php b/src/CountryHandler/Ireland.php
@@ -88,12 +88,12 @@ private function isFollowLength2(string $tin): bool
 
     private function isFollowPattern1(): bool
     {
-        return $this->matchPattern($this->getTIN(), self::PATTERN_1);
+        return $this->matchPattern($this->normalizeTin($this->getTIN()), self::PATTERN_1);
     }
 
     private function isFollowPattern2(): bool
     {
-        return $this->matchPattern($this->getTIN(), self::PATTERN_2);
+        return $this->matchPattern($this->normalizeTin($this->getTIN()), self::PATTERN_2);
     }
 
     private function letterToNumber(string $toConv): int

diff --git a/src/CountryHandler/Spain.php b/src/CountryHandler/Spain.php
@@ -51,7 +51,7 @@ final class Spain extends CountryHandler
 
     public function getTIN(): string
     {
-        return str_pad(parent::getTIN(), self::LENGTH, '0', STR_PAD_LEFT);
+        return str_pad($this->normalizeTin(parent::getTIN()), self::LENGTH, '0', STR_PAD_LEFT);
     }
 
     protected function hasValidPattern(string $tin): bool