Merge pull request antonioribeiro#53 from antonioribeiro/analysis-q1vL41

Apply fixes from StyleCI

[ci skip] [skip ci]

Author: antonioribeiro

src/package/Support/Base.php

@@ -7,7 +7,7 @@
 class Base
 {
     /**
-     * Console command
+     * Console command.
      *
      * @var \Illuminate\Console\Command
      */
@@ -137,14 +137,13 @@ private function loadFile($file)
      */
     protected function makeJsonFileName($key, $dir = '')
     {
-        if (!ends_with(DIRECTORY_SEPARATOR, $dir)) {
+        if (! ends_with(DIRECTORY_SEPARATOR, $dir)) {
             $dir .= DIRECTORY_SEPARATOR;
         }
 
         return $this->dataDir(_dir($dir).strtolower($key).'.json');
     }
 
-
     /**
      * Put contents into a file.
      *
@@ -202,6 +201,7 @@ public function getHomeDir()
     {
         return getClassDir(Service::class);
     }
+
     /**
      * Get a cached value.
      *

src/package/Support/UpdateData.php

@@ -67,7 +67,7 @@ private function eraseDataDir($dir)
 
     /**
      * Generate json files from array.
-     * s
+     * s.
      * @param $result
      * @param $dir
      * @param Closure $makeGroupKeyClosure
@@ -78,14 +78,14 @@ private function generateJsonFiles($result, $dir, $makeGroupKeyClosure)
         $count2 = 0;
 
         $count1 = countriesCollect($result)->map(function ($item) {
-            return $this->normalize(countriesCollect($item)->mapWithKeys(function($value, $key) {
+            return $this->normalize(countriesCollect($item)->mapWithKeys(function ($value, $key) {
                 return [strtolower($key) => $value];
             }));
         })->groupBy('grouping')->each(function ($item, $key) use ($dir, $makeGroupKeyClosure, &$count2) {
             $this->mkdir(dirname($file = $this->makeJsonFileName($key, $dir)));
 
             $item = $item->mapWithKeys(function ($item) use ($makeGroupKeyClosure) {
-                return [$makeGroupKeyClosure($item) => countriesCollect($item)->sortBy(function($value, $key) {
+                return [$makeGroupKeyClosure($item) => countriesCollect($item)->sortBy(function ($value, $key) {
                     return $key;
                 })];
             })->sortBy(function ($value, $key) {
@@ -188,7 +188,7 @@ public function updateCities()
 
         $result = $this->loadShapeFile('natural_earth/ne_10m_populated_places');
 
-        list($countries, $cities) = $this->generateJsonFiles($result, $dataDir, function($item) {
+        list($countries, $cities) = $this->generateJsonFiles($result, $dataDir, function ($item) {
             return snake_case(strtolower($item['nameascii']));
         });
 
@@ -221,7 +221,7 @@ public function updateCountries()
      * @param \PragmaRX\Countries\Package\Support\Collection $country2
      * @return mixed
      */
-    function mergeCountries($country1, $country2)
+    public function mergeCountries($country1, $country2)
     {
         if (is_null($country2)) {
             return $country1;
@@ -237,7 +237,7 @@ function mergeCountries($country1, $country2)
             }
 
             if ($got !== $value) {
-                $country2[$key . '_nev'] = $value; // Natural Earth Vector
+                $country2[$key.'_nev'] = $value; // Natural Earth Vector
             }
         }
 
@@ -257,7 +257,7 @@ public function updateStates()
 
         $result = $this->loadShapeFile('natural_earth/ne_10m_admin_1_states_provinces');
 
-        list($countries, $states) = $this->generateJsonFiles($result, $dataDir, function($item) {
+        list($countries, $states) = $this->generateJsonFiles($result, $dataDir, function ($item) {
             return $this->makeStatePostalCode($item);
         });
 

src/package/Support/helpers.php

@@ -143,13 +143,12 @@ function load_shapefile($dir)
 
         unset($shapeRecords);
 
-        return countriesCollect($result)->mapWithKeys(function($fields, $key1) {
+        return countriesCollect($result)->mapWithKeys(function ($fields, $key1) {
             return [
-                strtolower($key1) => countriesCollect($fields)->mapWithKeys(function($value, $key2) {
+                strtolower($key1) => countriesCollect($fields)->mapWithKeys(function ($value, $key2) {
                     return [strtolower($key2) => $value];
-                })
+                }),
             ];
         });
     }
 }
-