Refactor filing status

spurwork · Jul 29, 2017 · fbe2ff8 · fbe2ff8
1 parent 5534512
commit fbe2ff8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 28 deletions.
diff --git a/src/Countries/US/Alabama/AlabamaIncome/AlabamaIncome.php b/src/Countries/US/Alabama/AlabamaIncome/AlabamaIncome.php
@@ -8,4 +8,10 @@ abstract class AlabamaIncome extends BaseIncome
 {
     const TYPE = 'state';
     const WITHHELD = true;
+
+    const FILING_ZERO = 0;
+    const FILING_SINGLE = 1;
+    const FILING_HEAD_OF_HOUSEHOLD = 2;
+    const FILING_MARRIED = 3;
+    const FILING_SEPERATE = 4;
 }
diff --git a/src/Countries/US/Alabama/AlabamaIncome/V20170101/AlabamaIncome.php b/src/Countries/US/Alabama/AlabamaIncome/V20170101/AlabamaIncome.php
@@ -9,12 +9,6 @@
 
 class AlabamaIncome extends BaseAlabamaIncome
 {
-    const FILING_ZERO = 0;
-    const FILING_SINGLE = 1;
-    const FILING_HEAD_OF_HOUSEHOLD = 2;
-    const FILING_MARRIED = 3;
-    const FILING_SEPERATE = 4;
-
     const SUPPLEMENTAL_TAX_RATE = 0.05;
 
     const SINGLE_BRACKETS = [

diff --git a/src/Models/Countries/US/Alabama/AlabamaIncomeTaxInformation.php b/src/Models/Countries/US/Alabama/AlabamaIncomeTaxInformation.php
@@ -8,19 +8,13 @@
 
 class AlabamaIncomeTaxInformation extends BaseTaxInformationModel
 {
-    const FILING_ZERO = 0;
-    const FILING_SINGLE = 1;
-    const FILING_HEAD_OF_HOUSEHOLD = 2;
-    const FILING_MARRIED = 3;
-    const FILING_SEPERATE = 4;
-
     protected $config_name = 'taxes.tables.us.alabama.alabama_income_tax_information';
 
     public static function getDefault()
     {
         $tax_information = new self();
         $tax_information->dependents = 0;
-        $tax_information->filing_status = static::FILING_SINGLE;
+        $tax_information->filing_status = AlabamaIncome::FILING_SINGLE;
         return $tax_information;
     }
 

diff --git a/src/Models/Countries/US/FederalIncomeTaxInformation.php b/src/Models/Countries/US/FederalIncomeTaxInformation.php
@@ -8,19 +8,13 @@
 
 class FederalIncomeTaxInformation extends BaseTaxInformationModel
 {
-    const FILING_SINGLE = 0;
-    const FILING_WIDOW = 1;
-    const FILING_HEAD_OF_HOUSEHOLD = 2;
-    const FILING_MARRIED = 3;
-    const FILING_SEPERATE = 4;
-
     protected $config_name = 'taxes.tables.us.federal_income_tax_information';
 
     public static function getDefault()
     {
         $tax_information = new self();
         $tax_information->exemptions = 0;
-        $tax_information->filing_status = static::FILING_SINGLE;
+        $tax_information->filing_status = FederalIncome::FILING_SINGLE;
         $tax_information->non_resident_alien = false;
         return $tax_information;
     }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -43,14 +43,14 @@ public function setUp()
         FederalIncomeTaxInformation::createForUser([
             'additional_withholding' => 0,
             'exemptions' => 0,
-            'filing_status' => FederalIncomeTaxInformation::FILING_SINGLE,
+            'filing_status' => FederalIncome::FILING_SINGLE,
             'non_resident_alien' => false,
         ], $this->user);
 
         AlabamaIncomeTaxInformation::createForUser([
             'additional_withholding' => 0,
             'dependents' => 0,
-            'filing_status' => AlabamaIncomeTaxInformation::FILING_SINGLE,
+            'filing_status' => AlabamaIncome::FILING_SINGLE,
         ], $this->user);
     }
 

diff --git a/tests/Unit/Countries/US/Alabama/AlabamaIncomeTest.php b/tests/Unit/Countries/US/Alabama/AlabamaIncomeTest.php
@@ -59,7 +59,7 @@ public function testAlabamaIncomeNonNegative()
 
     public function testAlabamaIncomeWithNoPersonalExemption()
     {
-        AlabamaIncomeTaxInformation::forUser($this->user)->update(['filing_status' => AlabamaIncomeTaxInformation::FILING_ZERO]);
+        AlabamaIncomeTaxInformation::forUser($this->user)->update(['filing_status' => AlabamaIncome::FILING_ZERO]);
 
         $results = $this->taxes->calculate(function ($taxes) {
             $taxes->setWorkLocation($this->getLocation('us.alabama'));

diff --git a/tests/Unit/Countries/US/FederalIncomeTest.php b/tests/Unit/Countries/US/FederalIncomeTest.php
@@ -37,7 +37,7 @@ public function testNoTaxesOwed()
 
         $this->assertSame(0.0, $results->getTax(FederalIncome::class));
 
-        FederalIncomeTaxInformation::forUser($this->user)->update(['filing_status' => FederalIncomeTaxInformation::FILING_MARRIED]);
+        FederalIncomeTaxInformation::forUser($this->user)->update(['filing_status' => FederalIncome::FILING_MARRIED]);
 
         $results = $this->taxes->calculate(function ($taxes) {
             $taxes->setWorkLocation($this->getLocation('us'));
@@ -58,7 +58,7 @@ public function testTaxesOwed()
 
         $this->assertSame(0.10, $results->getTax(FederalIncome::class));
 
-        FederalIncomeTaxInformation::forUser($this->user)->update(['filing_status' => FederalIncomeTaxInformation::FILING_MARRIED]);
+        FederalIncomeTaxInformation::forUser($this->user)->update(['filing_status' => FederalIncome::FILING_MARRIED]);
 
         $results = $this->taxes->calculate(function ($taxes) {
             $taxes->setWorkLocation($this->getLocation('us'));
@@ -83,7 +83,7 @@ public function testAdditionalWithholding()
 
         FederalIncomeTaxInformation::forUser($this->user)->update([
             'additional_withholding' => 20,
-            'filing_status' => FederalIncomeTaxInformation::FILING_MARRIED
+            'filing_status' => FederalIncome::FILING_MARRIED
         ]);
 
         $results = $this->taxes->calculate(function ($taxes) {

diff --git a/tests/Unit/Models/TaxInformationTest.php b/tests/Unit/Models/TaxInformationTest.php
@@ -13,13 +13,13 @@ public function testCreateForUser()
         $federal_income_tax_information = TaxInformation::forUser($this->user)->isTypeOf(FederalIncomeTaxInformation::class)->first()->information;
 
         $this->assertSame(0, $federal_income_tax_information->exemptions);
-        $this->assertSame(FederalIncomeTaxInformation::FILING_SINGLE, $federal_income_tax_information->filing_status);
+        $this->assertSame(FederalIncome::FILING_SINGLE, $federal_income_tax_information->filing_status);
         $this->assertSame(false, $federal_income_tax_information->non_resident_alien);
 
         $federal_income_tax_information = FederalIncomeTaxInformation::forUser($this->user)->first();
 
         $this->assertSame(0, $federal_income_tax_information->exemptions);
-        $this->assertSame(FederalIncomeTaxInformation::FILING_SINGLE, $federal_income_tax_information->filing_status);
+        $this->assertSame(FederalIncome::FILING_SINGLE, $federal_income_tax_information->filing_status);
         $this->assertSame(false, $federal_income_tax_information->non_resident_alien);
     }
 }