antonioribeiro / countries

src/package/Support/Collection.php

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
      */
     private function arrayFinder(string $propertyName, $find, Closure $finderClosure)
     {
-        return $this->filter(function ($data) use ($find, $propertyName, $finderClosure) {
+        return $this->filter(function($data) use ($find, $propertyName, $finderClosure) {
             try {
                 $attributeValue = $data->{$propertyName};
             } catch (\Exception $e) {
@@ -121,7 +121,7 @@ 
      */
     private function _whereKey(string $arrayName, $value)
     {
-        $finderClosure = function ($value, $attributeValue) {
+        $finderClosure = function($value, $attributeValue) {
             return Arr::has($attributeValue, $value);
         };
 
@@ -137,7 +137,7 @@ 
      */
     private function _whereAttribute(string $arrayName, $value)
     {
-        $finderClosure = function ($value, $attributeValue) {
+        $finderClosure = function($value, $attributeValue) {
             return in_array($value, $attributeValue->toArray());
         };
 

src/package/Support/helpers.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 use PragmaRX\Countries\Package\Support\Collection;
 
-if (! function_exists('array_sort_by_keys_recursive')) {
+if (!function_exists('array_sort_by_keys_recursive')) {
     /**
      * Recursively sort array by keys.
      *
@@ -21,7 +21,7 @@ 
     }
 }
 
-if (! function_exists('countriesCollect')) {
+if (!function_exists('countriesCollect')) {
     /**
      * Check if array is multidimensional.
      *
@@ -34,7 +34,7 @@ 
     }
 }
 
-if (! function_exists('arrayable')) {
+if (!function_exists('arrayable')) {
     /**
      * Recursively change all array keys case.
      *

src/package/Services/Config.php

Doc Comments +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     /**
      * Config constructor.
      *
-     * @param array|null $config
+     * @param Helper $config
      */
     public function __construct($config = null)
     {
@@ -24,7 +24,7 @@ 
     }
 
     /**
-     * @param $key
+     * @param string $key
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function get($key)

src/package/Services/Countries.php

Doc Comments +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
     }
 
     /**
-     * @param $repository
+     * @param null|Repository $repository
      * @return Repository
      */
     protected function instantiateRepository($repository)

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,10 +2,10 @@
 
 namespace PragmaRX\Countries\Package\Services;
 
-use PragmaRX\Countries\Update\Updater;
-use PragmaRX\Countries\Package\Support\Base;
 use PragmaRX\Coollection\Package\Coollection;
 use PragmaRX\Countries\Package\Data\Repository;
+use PragmaRX\Countries\Package\Support\Base;
+use PragmaRX\Countries\Update\Updater;
 
 class Countries extends Base
 {

Spacing +8 added lines, -8 removed lines

@@ -102,14 +102,14 @@ 
     {
         $instance = $this;
 
-        Coollection::macro('hydrate', function ($elements = null) use ($instance) {
+        Coollection::macro('hydrate', function($elements = null) use ($instance) {
             return $instance->hydrate($this, $elements);
         });
 
         foreach (Hydrator::HYDRATORS as $hydrator) {
             $hydrator = 'hydrate'.studly_case($hydrator);
 
-            Coollection::macro($hydrator, function () use ($hydrator, $instance) {
+            Coollection::macro($hydrator, function() use ($hydrator, $instance) {
                 return $instance->getRepository()->getHydrator()->{$hydrator}($this);
             });
         }
@@ -175,8 +175,8 @@ 
      */
     protected function instantiateCache(Cache $cache = null)
     {
-        if (is_null($this->cache) || ! is_null($cache)) {
-            $this->cache = ! is_null($cache)
+        if (is_null($this->cache) || !is_null($cache)) {
+            $this->cache = !is_null($cache)
                 ? $cache
                 : new Cache($this->config);
         }
@@ -192,8 +192,8 @@ 
      */
     protected function instantiateConfig($config = null)
     {
-        if (is_null($this->config) || ! is_null($config)) {
-            $this->config = ! is_null($config)
+        if (is_null($this->config) || !is_null($config)) {
+            $this->config = !is_null($config)
                 ? $config
                 : new Config($this->helper);
         }
@@ -224,8 +224,8 @@ 
      */
     protected function instantiateHydrator(Hydrator $hydrator = null)
     {
-        if (is_null($this->hydrator) || ! is_null($hydrator)) {
-            $this->hydrator = ! is_null($hydrator)
+        if (is_null($this->hydrator) || !is_null($hydrator)) {
+            $this->hydrator = !is_null($hydrator)
                 ? $hydrator
                 : new Hydrator($this->config);
         }

src/update/Updater.php

Doc Comments +5 added lines, -5 removed lines

@@ -125,7 +125,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return Command
      */
     public function getCommand()
     {
@@ -204,8 +204,8 @@ 
     }
 
     /**
-     * @param $result
-     * @param $type
+     * @param Coollection $result
+     * @param string $type
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function addRecordType($result, $type)
@@ -244,7 +244,7 @@ 
      * @param \PragmaRX\Coollection\Package\Coollection $on
      * @param \PragmaRX\Coollection\Package\Coollection $by
      * @param $fields
-     * @param $codeField
+     * @param string $codeField
      * @return array
      */
     public function findByFields($on, $by, $fields, $codeField)
@@ -324,7 +324,7 @@ 
     /**
      * @param $result
      * @param $dir
-     * @param $normalizerClosure
+     * @param Closure $normalizerClosure
      * @return array
      */
     public function normalizeData($result, $dir, $normalizerClosure)

Unused Use Statements +2 added lines, -3 removed lines

@@ -3,13 +3,12 @@
 namespace PragmaRX\Countries\Update;
 
 use Closure;
-use PragmaRX\Countries\Package\Support\Base;
 use PragmaRX\Coollection\Package\Coollection;
+use PragmaRX\Countries\Package\Contracts\Config as ConfigContract;
 use PragmaRX\Countries\Package\Services\Cache;
-use PragmaRX\Countries\Package\Contracts\Config;
 use PragmaRX\Countries\Package\Services\Command;
 use PragmaRX\Countries\Package\Services\Config as ConfigService;
-use PragmaRX\Countries\Package\Contracts\Config as ConfigContract;
+use PragmaRX\Countries\Package\Support\Base;
 
 /**
  * @codeCoverageIgnore

Spacing +10 added lines, -10 removed lines

@@ -194,7 +194,7 @@ 
             $record = $record->toArray();
         }
 
-        if (! isset($record[$field = 'data_sources'])) {
+        if (!isset($record[$field = 'data_sources'])) {
             $record['data_sources'] = [];
         }
 
@@ -250,7 +250,7 @@ 
     public function findByFields($on, $by, $fields, $codeField)
     {
         foreach ($fields as $field) {
-            if (isset($by[$field[1]]) && ! is_null($found = $on->where($field[0], $by[$field[1]])->first())) {
+            if (isset($by[$field[1]]) && !is_null($found = $on->where($field[0], $by[$field[1]])->first())) {
                 return [coollect($found), $found->{$codeField}];
             }
         }
@@ -268,19 +268,19 @@ 
      */
     public function generateAllJsonFiles($dir, $makeGroupKeyClosure, $records, $groupKey)
     {
-        if (! empty($groupKey)) {
+        if (!empty($groupKey)) {
             $records = $records->groupBy($groupKey);
         }
 
-        $records->each(function (Coollection $record, $key) use ($dir, $makeGroupKeyClosure) {
+        $records->each(function(Coollection $record, $key) use ($dir, $makeGroupKeyClosure) {
             $this->helper->mkdir(dirname($file = $this->helper->makeJsonFileName($key, $dir)));
 
-            $record = $record->mapWithKeys(function ($record, $key) use ($makeGroupKeyClosure) {
+            $record = $record->mapWithKeys(function($record, $key) use ($makeGroupKeyClosure) {
                 $key = is_null($makeGroupKeyClosure)
                     ? $key
                     : $makeGroupKeyClosure($record, $key);
 
-                $record = coollect($record)->sortBy(function ($value, $key) {
+                $record = coollect($record)->sortBy(function($value, $key) {
                     return $key;
                 });
 
@@ -332,9 +332,9 @@ 
         return $this->cache->remember(
             'normalizeData'.$dir,
             160,
-            function () use ($dir, $result, $normalizerClosure) {
-                return coollect($result)->map(function ($item, $key) use ($normalizerClosure) {
-                    return $normalizerClosure(coollect($item)->mapWithKeys(function ($value, $key) {
+            function() use ($dir, $result, $normalizerClosure) {
+                return coollect($result)->map(function($item, $key) use ($normalizerClosure) {
+                    return $normalizerClosure(coollect($item)->mapWithKeys(function($value, $key) {
                         return [strtolower($key) => $value];
                     }), $key);
                 });
@@ -363,7 +363,7 @@ 
             $countryCode = $this->helper->caseForKey($item['name']);
         }
 
-        $item['iso_a3'] = ! isset($item['iso_a3'])
+        $item['iso_a3'] = !isset($item['iso_a3'])
             ? $countryCode
             : $item['iso_a3'];
 

src/update/Rinvex.php

Spacing +7 added lines, -7 removed lines

@@ -61,7 +61,7 @@ 
             'latlng'       => 'geo',
         ];
 
-        coollect($mergeable)->each(function ($to, $key) use (&$natural) {
+        coollect($mergeable)->each(function($to, $key) use (&$natural) {
             if (isset($natural[$key])) {
                 $natural->overwrite([$to => [$key => $natural[$key]]]);
 
@@ -113,7 +113,7 @@ 
      */
     public function findRinvexState($country, $needle)
     {
-        $states = $this->findRinvex($country, 'divisions')->map(function ($state, $postal) {
+        $states = $this->findRinvex($country, 'divisions')->map(function($state, $postal) {
             $state['postal'] = $postal;
 
             $state['name'] = $this->helper->fixUtf8($state['name']);
@@ -125,12 +125,12 @@ 
             return $states;
         }
 
-        $state = $states->filter(function ($rinvexState) use ($needle) {
+        $state = $states->filter(function($rinvexState) use ($needle) {
             return $rinvexState->postal == $needle->postal ||
                 $rinvexState->name == $needle['name'] ||
                 utf8_encode($rinvexState->name) == $needle['name'] ||
                 $rinvexState->alt_names->contains($needle['name']) ||
-                $rinvexState->alt_names->contains(function ($name) use ($needle) {
+                $rinvexState->alt_names->contains(function($name) use ($needle) {
                     return $needle->alt_names->contains($name);
                 });
         })->first();
@@ -204,7 +204,7 @@ 
                 continue;
             }
 
-            if ($rinvexValue !== $naturalValue && ! $defaultToRinvex->contains($key)) {
+            if ($rinvexValue !== $naturalValue && !$defaultToRinvex->contains($key)) {
                 $result[$key.$suffix] = $rinvexValue; // Natural Earth Vector
             }
 
@@ -213,7 +213,7 @@ 
                 : $naturalValue; // Natural Earth Vector
         }
 
-        return coollect($result)->sortBy(function ($value, $key) {
+        return coollect($result)->sortBy(function($value, $key) {
             return $key;
         });
     }
@@ -226,7 +226,7 @@ 
      */
     public function mergeCountryStatesWithRinvex($states)
     {
-        return coollect($states)->map(function ($state) {
+        return coollect($states)->map(function($state) {
             return $this->mergeStateWithRinvex($state);
         });
     }

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,8 +3,8 @@
 namespace PragmaRX\Countries\Update;
 
 use Exception;
-use PragmaRX\Countries\Package\Support\Base;
 use PragmaRX\Coollection\Package\Coollection;
+use PragmaRX\Countries\Package\Support\Base;
 
 class Rinvex extends Base
 {

Doc Comments +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
      *
      * @param Coollection $natural
      * @param Coollection $rinvex
-     * @param $translation
+     * @param null|Coollection $translation
      * @param string $suffix
      * @return mixed|\PragmaRX\Coollection\Package\Coollection
      */

src/update/States.php

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 
         $this->helper->message('Processing states...');
 
-        $normalizerClosure = function ($item) {
+        $normalizerClosure = function($item) {
             $item = $this->updater->addDataSource($item, 'natural');
 
             $item = $this->updater->addRecordType($item, 'state');
@@ -59,11 +59,11 @@ 
             return $this->updater->normalizeStateOrCityData($item);
         };
 
-        $getCodeClosure = function ($item) {
+        $getCodeClosure = function($item) {
             return $this->makeStatePostalCode($item);
         };
 
-        $mergerClosure = function ($states) {
+        $mergerClosure = function($states) {
             return $this->rinvex->mergeCountryStatesWithRinvex($states);
         };
 
@@ -90,7 +90,7 @@ 
             }
         }
 
-        if (! empty(trim($item->postal))) {
+        if (!empty(trim($item->postal))) {
             $item->postal;
         }
 

src/update/Countries.php

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 
         $dataDir = '/countries/default/';
 
-        $this->updater->setCountries($this->cache->remember('updateCountries->buildCountriesCoollection', 160, function () use ($dataDir) {
+        $this->updater->setCountries($this->cache->remember('updateCountries->buildCountriesCoollection', 160, function() use ($dataDir) {
             $this->helper->eraseDataDir($dataDir);
 
             return $this->buildCountriesCoollection($dataDir);
@@ -100,12 +100,12 @@ 
 
         $mledoze = $this->mledoze->loadMledozeCountries();
 
-        $countries = coollect($this->helper->loadShapeFile('third-party/natural_earth/ne_10m_admin_0_countries'))->map(function ($country) {
+        $countries = coollect($this->helper->loadShapeFile('third-party/natural_earth/ne_10m_admin_0_countries'))->map(function($country) {
             return $this->natural->fixNaturalOddCountries($country);
-        })->mapWithKeys(function ($natural) use ($mledoze, $dataDir) {
+        })->mapWithKeys(function($natural) use ($mledoze, $dataDir) {
             list($mledoze, $countryCode) = $this->mledoze->findMledozeCountry($mledoze, $natural);
 
-            $natural = coollect($natural)->mapWithKeys(function ($country, $key) {
+            $natural = coollect($natural)->mapWithKeys(function($country, $key) {
                 return [strtolower($key) => $country];
             });
 
@@ -143,7 +143,7 @@ 
 
     public function clearCountryCurrencies($country)
     {
-        if (isset($country['currency']) && ! is_null($country['currency'])) {
+        if (isset($country['currency']) && !is_null($country['currency'])) {
             $country['currencies'] = array_keys($country['currency']);
 
             unset($country['currency']);

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
     /**
      * Build countries collection.
      *
-     * @param $dataDir
+     * @param string $dataDir
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function buildCountriesCoollection($dataDir)

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,10 +2,10 @@
 
 namespace PragmaRX\Countries\Update;
 
-use PragmaRX\Countries\Package\Support\Base;
+use PragmaRX\Countries\Package\Countries as CountriesService;
 use PragmaRX\Countries\Package\Services\Cache;
 use PragmaRX\Countries\Package\Services\Config;
-use PragmaRX\Countries\Package\Countries as CountriesService;
+use PragmaRX\Countries\Package\Support\Base;
 
 class Countries extends Base
 {

src/update/Mledoze.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function loadMledozeCountries()
     {
-        $mledoze = coollect($this->helper->loadJson('countries', 'third-party/mledoze/dist'))->mapWithKeys(function (
+        $mledoze = coollect($this->helper->loadJson('countries', 'third-party/mledoze/dist'))->mapWithKeys(function(
             $country
         ) {
             $country = $this->updater->addDataSource($country, 'mledoze');
@@ -98,7 +98,7 @@ 
     {
         list($country, $countryCode) = $this->updater->findCountryByAnyField($mledoze, $natural);
 
-        if (! $country->isEmpty()) {
+        if (!$country->isEmpty()) {
             return [coollect($this->helper->arrayKeysSnakeRecursive($country)), $countryCode];
         }
 
@@ -146,7 +146,7 @@ 
             $result[$key] = $mledozeValue; // Natural Earth Vector
         }
 
-        return coollect($result)->sortBy(function ($value, $key) {
+        return coollect($result)->sortBy(function($value, $key) {
             return $key;
         });
     }

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace PragmaRX\Countries\Update;
 
-use PragmaRX\Countries\Package\Support\Base;
 use PragmaRX\Coollection\Package\Coollection;
+use PragmaRX\Countries\Package\Support\Base;
 
 class Mledoze extends Base
 {

Doc Comments +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
      * Fill mledoze fields with natural earth vector data.
      *
      * @param $fields
-     * @return mixed
+     * @return Coollection
      */
     public function fillMledozeFields($fields)
     {
@@ -110,7 +110,7 @@ 
      * @param \PragmaRX\Coollection\Package\Coollection $mledoze
      * @param \PragmaRX\Coollection\Package\Coollection $natural
      * @param string $suffix
-     * @return mixed
+     * @return Coollection
      */
     public function mergeWithMledoze($mledoze, $natural, $suffix = '_nev')
     {