Merge pull request #18 from mpociot/analysis-XVr5PK

Applied fixes from StyleCI
driesvints · Apr 7, 2016 · 3d5bef2 · 3d5bef2
2 parents 4ec448a + 2e8a9e5
commit 3d5bef2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/Mpociot/VatCalculator/VatCalculator.php b/src/Mpociot/VatCalculator/VatCalculator.php
@@ -127,10 +127,10 @@ public function __construct($config = null)
      */
     private function getClientIP()
     {
-        if (isset($_SERVER[ 'HTTP_X_FORWARDED_FOR' ]) && $_SERVER[ 'HTTP_X_FORWARDED_FOR' ]) {
-            $clientIpAddress = $_SERVER[ 'HTTP_X_FORWARDED_FOR' ];
-        } elseif (isset($_SERVER[ 'REMOTE_ADDR' ]) && $_SERVER[ 'REMOTE_ADDR' ]) {
-            $clientIpAddress = $_SERVER[ 'REMOTE_ADDR' ];
+        if (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR']) {
+            $clientIpAddress = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        } elseif (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR']) {
+            $clientIpAddress = $_SERVER['REMOTE_ADDR'];
         } else {
             $clientIpAddress = '';
         }
@@ -150,27 +150,29 @@ public function getIPBasedCountry()
         $ip = $this->getClientIP();
         $url = self::GEOCODE_SERVICE_URL.$ip;
         $result = file_get_contents($url);
-        switch ($result[ 0 ]) {
+        switch ($result[0]) {
             case '1':
                 $data = explode(';', $result);
 
-                return $data[ 1 ];
+                return $data[1];
                 break;
             default:
                 return false;
         }
     }
 
     /**
-     * Determines if you need to collect VAT for the given country code
+     * Determines if you need to collect VAT for the given country code.
      *
      * @param $countryCode
+     *
      * @return bool
      */
     public function shouldCollectVAT($countryCode)
     {
         $taxKey = 'vat_calculator.rules.'.strtoupper($countryCode);
-        return (isset($this->taxRules[ strtoupper($countryCode) ]) || (isset($this->config) && $this->config->has($taxKey)));
+
+        return isset($this->taxRules[strtoupper($countryCode)]) || (isset($this->config) && $this->config->has($taxKey));
     }
 
     /**
@@ -273,7 +275,7 @@ public function getTaxRateForCountry($countryCode, $company = false)
             return $this->config->get($taxKey, 0);
         }
 
-        return isset($this->taxRules[ strtoupper($countryCode) ]) ? $this->taxRules[ strtoupper($countryCode) ] : 0;
+        return isset($this->taxRules[strtoupper($countryCode)]) ? $this->taxRules[strtoupper($countryCode)] : 0;
     }
 
     /**

diff --git a/tests/VatCalculatorTest.php b/tests/VatCalculatorTest.php
@@ -400,7 +400,7 @@ public function testCanResolveInvalidIPToCountry()
     public function testCanHandleIPServiceDowntime()
     {
         self::$file_get_contents_result = false;
-        $_SERVER[ 'REMOTE_ADDR' ] = '';
+        $_SERVER['REMOTE_ADDR'] = '';
         $vatCalculator = new VatCalculator();
         $country = $vatCalculator->getIPBasedCountry();
         $this->assertFalse($country);
@@ -465,7 +465,6 @@ public function testCompanyOutsideBusinessCountryGetsValidVATRate()
 
     public function testShouldCollectVAT()
     {
-
         $vatCalculator = new VatCalculator();
         $this->assertTrue($vatCalculator->shouldCollectVAT('DE'));
         $this->assertTrue($vatCalculator->shouldCollectVAT('NL'));
@@ -492,6 +491,4 @@ public function testShouldCollectVATFromConfig()
         $vatCalculator = new VatCalculator($config);
         $this->assertTrue($vatCalculator->shouldCollectVAT($countryCode));
     }
-
-
 }