Merge pull request #6 from garciasdos/main

Support for New Scottish Tax Code SD3

Author: owenvoke

src/Middlewares/TaxCodeModifier.php

@@ -15,6 +15,7 @@
 use Worksome\UkTaxCodeValidator\Rules\NoTaxesRule;
 use Worksome\UkTaxCodeValidator\Rules\RuleInterface;
 use Worksome\UkTaxCodeValidator\Rules\TemporaryTaxCodeRule;
+use Worksome\UkTaxCodeValidator\Rules\AdvancedScottishRateRule;
 use Worksome\UkTaxCodeValidator\Rules\TopScottishRateRule;
 use Worksome\UkTaxCodeValidator\TaxCode;
 
@@ -35,6 +36,7 @@ public function __construct()
             new MarriageAllowanceTransferredRule($this),
             new HigherRateRule($this),
             new AdditionalRateRule($this),
+            new AdvancedScottishRateRule($this),
             new TopScottishRateRule($this),
             new NoTaxesRule($this),
         ];

src/Rules/AdvancedScottishRateRule.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Worksome\UkTaxCodeValidator\Rules;
+
+use Worksome\UkTaxCodeValidator\TaxCode;
+
+class AdvancedScottishRateRule extends RegexRule
+{
+    public function validate(TaxCode $taxCode): bool
+    {
+        // Validate against full tax code, as a D2
+        // should always have a scottish regime modifier in front.
+        return parent::validate(
+            new TaxCode($taxCode->getOriginalTaxCode())
+        );
+    }
+
+    protected function regex(): string
+    {
+        return /* @lang RegExp */ '/^SD2/';
+    }
+
+    protected function regexForConsume(): string
+    {
+        return /* @lang RegExp */ '/^D2/';
+    }
+}

src/Rules/TopScottishRateRule.php

@@ -8,7 +8,7 @@ class TopScottishRateRule extends RegexRule
 {
     public function validate(TaxCode $taxCode): bool
     {
-        // Validate against full tax code, as a D2
+        // Validate against full tax code, as a D3
         // should always have a scottish regime modifier in front.
         return parent::validate(
             new TaxCode($taxCode->getOriginalTaxCode())
@@ -17,11 +17,11 @@ public function validate(TaxCode $taxCode): bool
 
     protected function regex(): string
     {
-        return /* @lang RegExp */ '/^SD2/';
+        return /* @lang RegExp */ '/^SD3/';
     }
 
     protected function regexForConsume(): string
     {
-        return /* @lang RegExp */ '/^D2/';
+        return /* @lang RegExp */ '/^D3/';
     }
 }

tests/EngineTest.php

@@ -28,6 +28,8 @@
     // Not taxed
     'NT', 'NTX', 'NTM1',
     // Top scottish rates
+    'SD3', 'SD3X',
+    // Advanced scottish rates
     'SD2', 'SD2X',
     // Random tests
     'S 123 3 L',