Apply fixes from StyleCI

[ci skip] [skip ci]
lukepolo · Jan 27, 2018 · 26361a3 · 26361a3
1 parent 24d6d59
commit 26361a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/CartItem.php b/src/CartItem.php
@@ -278,8 +278,8 @@ public function getDiscount($format = true)
      * Gets the tax for the item.
      *
      * @param int $amountNotTaxable
-     *
      * @param int $totalDiscount
+     *
      * @return int|mixed
      */
     public function tax($amountNotTaxable = 0, $totalDiscount = 0)
@@ -296,18 +296,17 @@ public function tax($amountNotTaxable = 0, $totalDiscount = 0)
                 $itemCount++;
             }
 
-            if($totalDiscount !== 0) {
-                $totalTax = $totalTax - ($totalDiscount - ($totalDiscount/(1 + $this->tax)));
+            if ($totalDiscount !== 0) {
+                $totalTax = $totalTax - ($totalDiscount - ($totalDiscount / (1 + $this->tax)));
             }
 
             return $totalTax - $amountNotTaxable;
         }
 
         $totalTax = $this->tax * ($this->subTotal(false, !config('laracart.discountTaxable', false), true) - $amountNotTaxable);
 
-
-        if($totalDiscount !== 0) {
-            $totalTax = $totalTax - ($totalDiscount - ($totalDiscount/(1 + $this->tax)));
+        if ($totalDiscount !== 0) {
+            $totalTax = $totalTax - ($totalDiscount - ($totalDiscount / (1 + $this->tax)));
         }
 
         return $totalTax;

diff --git a/src/LaraCart.php b/src/LaraCart.php
@@ -561,7 +561,8 @@ public function removeFees()
      *
      * @param bool|true $format
      * @param bool|true $withFees
-     * @param bool $grossTaxes
+     * @param bool      $grossTaxes
+     *
      * @return string
      */
     public function taxTotal($format = true, $withFees = true, $grossTaxes = true)
@@ -600,6 +601,7 @@ public function taxTotal($format = true, $withFees = true, $grossTaxes = true)
                 }
             }
         }
+
         return $this->formatMoney($totalTax, null, null, $format);
     }
 

diff --git a/tests/TotalsTest.php b/tests/TotalsTest.php
@@ -305,7 +305,8 @@ public function testTaxationOnCoupons()
         $this->assertEquals(6639.12, $this->laracart->total(false));
     }
 
-    public function testTaxationAndDiscount() {
+    public function testTaxationAndDiscount()
+    {
         $this->app['config']->set('laracart.tax', .19);
         $this->app['config']->set('laracart.tax_by_item', true);
         $this->app['config']->set('laracart.discountTaxable', false);
@@ -322,7 +323,7 @@ public function testTaxationAndDiscount() {
         );
 
         $coupon = new \LukePOLO\LaraCart\Coupons\Fixed('50EUR', 50, [
-            'description' => '50EUR'
+            'description' => '50EUR',
         ]);
 
         $this->laracart->addCoupon($coupon);