change calculation result interface

esteit · Jan 14, 2016 · 639c213 · 639c213
1 parent c0f1d18
commit 639c213
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/src/CalculatorHandler/AramexCalculatorHandler.php b/src/CalculatorHandler/AramexCalculatorHandler.php
@@ -102,7 +102,7 @@ public function visit(CalculationResultInterface $result, PackageInterface $pack
         $this->validateWeight($package);
         $price = $this->getPrice($package);
 
-        $result->setTotalCost($price);
+        $result->setShippingCost($price);
         $result->setCurrency($this->get('currency'));
     }
 

diff --git a/src/CalculatorHandler/AsendiaCalculatorHandler.php b/src/CalculatorHandler/AsendiaCalculatorHandler.php
@@ -108,7 +108,7 @@ public function visit(CalculationResultInterface $result, PackageInterface $pack
         $fuelCost = $math->mul($wholeWeight, $this->get('fuel_subcharge'));
         $total = $math->sum($cost, $fuelCost);
 
-        $result->setTotalCost($total);
+        $result->setShippingCost($total);
         $result->setCurrency($this->get('currency'));
     }
 

diff --git a/src/CalculatorHandler/DhlCalculatorHandler.php b/src/CalculatorHandler/DhlCalculatorHandler.php
@@ -113,7 +113,7 @@ public function visit(CalculationResultInterface $result, PackageInterface $pack
         $zoneCalculator = $this->getZoneCalculator($package);
         $total = $zoneCalculator->calculate($weight);
 
-        $result->setTotalCost($total);
+        $result->setShippingCost($total);
         $result->setCurrency($this->get('currency'));
     }
 

diff --git a/src/CalculatorHandler/IParcelCalculatorHandler.php b/src/CalculatorHandler/IParcelCalculatorHandler.php
@@ -102,7 +102,7 @@ public function visit(CalculationResultInterface $result, PackageInterface $pack
         $this->validateWeight($package);
         $price = $this->getPrice($package);
 
-        $result->setTotalCost($price);
+        $result->setShippingCost($price);
         $result->setCurrency($this->get('currency'));
     }
 

diff --git a/src/Model/CalculationResult.php b/src/Model/CalculationResult.php
@@ -14,7 +14,7 @@ class CalculationResult implements CalculationResultInterface
     /**
      * @var string|int|float
      */
-    protected $totalCost;
+    protected $shippingCost;
 
     /**
      * @var BasicExceptionInterface
@@ -27,22 +27,22 @@ class CalculationResult implements CalculationResultInterface
     protected $currency;
 
     /**
-     * @param string|int|float $totalCost
+     * @param string|int|float $cost
      * @return $this
      */
-    public function setTotalCost($totalCost)
+    public function setShippingCost($cost)
     {
-        $this->totalCost = $totalCost;
+        $this->shippingCost = $cost;
 
         return $this;
     }
 
     /**
      * @return string|int|float
      */
-    public function getTotalCost()
+    public function getShippingCost()
     {
-        return $this->totalCost;
+        return $this->shippingCost;
     }
 
     /**

diff --git a/src/Model/CalculationResultInterface.php b/src/Model/CalculationResultInterface.php
@@ -18,15 +18,15 @@ public function setCurrency($currency);
     public function getCurrency();
 
     /**
-     * @param string|int|float $totalCost
+     * @param string|int|float $cost
      * @return $this
      */
-    public function setTotalCost($totalCost);
+    public function setShippingCost($cost);
 
     /**
      * @return string|int|float
      */
-    public function getTotalCost();
+    public function getShippingCost();
 
     /**
      * @param PackageInterface $package

diff --git a/tests/CalculatorHandler/AramexCalculatorHandlerTest.php b/tests/CalculatorHandler/AramexCalculatorHandlerTest.php
@@ -86,7 +86,7 @@ public function testVisit($package, $expectedCost)
 
         $this->assertInstanceOf('EsteIt\ShippingCalculator\Model\CalculationResultInterface', $result);
         $this->assertNull($result->getError());
-        $this->assertSame($expectedCost, $result->getTotalCost());
+        $this->assertSame($expectedCost, $result->getShippingCost());
         $this->assertSame('USD', $result->getCurrency());
     }
 

diff --git a/tests/CalculatorHandler/AsendiaCalculatorHandlerTest.php b/tests/CalculatorHandler/AsendiaCalculatorHandlerTest.php
@@ -84,7 +84,7 @@ public function testVisit()
 
         $this->assertInstanceOf('EsteIt\ShippingCalculator\Model\CalculationResultInterface', $result);
         $this->assertNull($result->getError());
-        $this->assertSame(22.1, $result->getTotalCost());
+        $this->assertSame(22.1, $result->getShippingCost());
         $this->assertSame('USD', $result->getCurrency());
     }
 

diff --git a/tests/CalculatorHandler/DhlCalculatorHandlerTest.php b/tests/CalculatorHandler/DhlCalculatorHandlerTest.php
@@ -84,7 +84,7 @@ public function testVisit($package, $expectedCost)
 
         $this->assertInstanceOf('EsteIt\ShippingCalculator\Model\CalculationResultInterface', $result);
         $this->assertNull($result->getError());
-        $this->assertSame($expectedCost, $result->getTotalCost());
+        $this->assertSame($expectedCost, $result->getShippingCost());
         $this->assertSame('USD', $result->getCurrency());
     }
 

diff --git a/tests/CalculatorHandler/IParcelCalculatorHandlerTest.php b/tests/CalculatorHandler/IParcelCalculatorHandlerTest.php
@@ -86,7 +86,7 @@ public function testVisit($package, $expectedCost)
 
         $this->assertInstanceOf('EsteIt\ShippingCalculator\Model\CalculationResultInterface', $result);
         $this->assertNull($result->getError());
-        $this->assertSame($expectedCost, $result->getTotalCost());
+        $this->assertSame($expectedCost, $result->getShippingCost());
         $this->assertSame('USD', $result->getCurrency());
     }