Webklex / laravel-geoip

src/GeoIP.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
      *
      * @return array|null
      */
-    public function current(){
+    public function current() {
         return $this->get($this->remote_address->getIpAddress());
     }
 
@@ -61,7 +61,7 @@ 
      *
      * @return array|null
      */
-    public function get($ip){
+    public function get($ip) {
         if (isset($this->cache[$ip])) {
             return $this->cache[$ip];
         }
@@ -88,15 +88,15 @@ 
             $output = curl_exec($ch);
             curl_close($ch);
 
-            if($output == false) {
+            if ($output == false) {
                 sleep(1);
-            }else{
+            } else {
                 return json_decode($output, true);
             }
 
             $retries++;
         }
-        while($retries > 0);
+        while ($retries > 0);
 
         return null;
     }

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
             if($output == false) {
                 sleep(1);
-            }else{
+            } else{
                 return json_decode($output, true);
             }
 

src/Providers/GeoIPServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function boot() {
         $this->publishes([
-            __DIR__ . '/../config/geoip.php' => config_path('geoip.php'),
+            __DIR__.'/../config/geoip.php' => config_path('geoip.php'),
         ]);
     }
 
@@ -55,7 +55,7 @@ 
      */
     private function setVendorConfig() {
         $config_key = 'geoip';
-        $path = __DIR__ . '/../config/' . $config_key . '.php';
+        $path = __DIR__.'/../config/'.$config_key.'.php';
 
         $vendor_config = require $path;
         $config = $this->app['config']->get($config_key);

Braces +9 added lines, -3 removed lines

@@ -86,11 +86,15 @@ 
         $arrays = func_get_args();
         $base = array_shift($arrays);
 
-        if (!is_array($base)) $base = empty($base) ? array() : array($base);
+        if (!is_array($base)) {
+            $base = empty($base) ? array() : array($base);
+        }
 
         foreach ($arrays as $append) {
 
-            if (!is_array($append)) $append = array($append);
+            if (!is_array($append)) {
+                $append = array($append);
+            }
 
             foreach ($append as $key => $value) {
 
@@ -102,7 +106,9 @@ 
                 if (is_array($value) or is_array($base[$key])) {
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
                 } else if (is_numeric($key)) {
-                    if (!in_array($value, $base)) $base[] = $value;
+                    if (!in_array($value, $base)) {
+                        $base[] = $value;
+                    }
                 } else {
                     $base[$key] = $value;
                 }

src/RemoteAddress.php

Spacing +6 added lines, -6 removed lines

@@ -105,7 +105,7 @@ 
     public function getIpAddress() {
         $ip_address = $this->getIpAddressFromProxy();
 
-        if($ip_address == "127.0.0.1" || strlen($ip_address) < 7) {
+        if ($ip_address == "127.0.0.1" || strlen($ip_address) < 7) {
             $ip_address = false;
         }
 
@@ -115,7 +115,7 @@ 
 
         $ip_address = $this->getServerVariable("REMOTE_ADDR");
 
-        if(strlen($ip_address) < 7) {
+        if (strlen($ip_address) < 7) {
             $ip_address = "127.0.0.1";
         }
 
@@ -175,12 +175,12 @@ 
         $header = strtoupper($header);
         $header = str_replace('-', '_', $header);
         if (0 !== strpos($header, 'HTTP_')) {
-            $header = 'HTTP_' . $header;
+            $header = 'HTTP_'.$header;
         }
         return $header;
     }
 
-    protected function getServerVariable($key, $default = null){
+    protected function getServerVariable($key, $default = null) {
         if (!isset($_SERVER[$key]) || empty($_SERVER[$key])) {
             return $default;
         }
@@ -191,7 +191,7 @@ 
     /**
      * @return bool
      */
-    public function isProxy(){
+    public function isProxy() {
         $test_HTTP_proxy_headers = [
             'HTTP_VIA',
             'VIA',
@@ -217,7 +217,7 @@ 
             'HTTP_PROXY_CONNECTION'
         ];
 
-        foreach($test_HTTP_proxy_headers as $header){
+        foreach ($test_HTTP_proxy_headers as $header) {
             if ($this->getServerVariable($header, false)) {
                 return true;
             }

Braces +3 added lines, -2 removed lines

@@ -248,8 +248,9 @@
         } else {
             $myisp = $isp[1].'.'.$isp[0];
         }
-        if (preg_match("/[0-9]{1,3}\.[0-9]{1,3}/", $myisp))
-            return null;
+        if (preg_match("/[0-9]{1,3}\.[0-9]{1,3}/", $myisp)) {
+                    return null;
+        }
 
         $isp = explode('.', $myisp);
         return $isp[0];