Webklex / laravel-geoip

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;
                 }