antonioribeiro / countries

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,12 +2,12 @@
 
 namespace PragmaRX\Countries\Package\Services;
 
-use PragmaRX\Countries\Update\Updater;
 use IlluminateAgnostic\Str\Support\Str;
-use PragmaRX\Countries\Package\Support\Base;
 use PragmaRX\Coollection\Package\Coollection;
 use PragmaRX\Countries\Package\Data\Repository;
 use PragmaRX\Countries\Package\Services\Cache\Service as Cache;
+use PragmaRX\Countries\Package\Support\Base;
+use PragmaRX\Countries\Update\Updater;
 
 class Countries extends Base
 {

Spacing +8 added lines, -8 removed lines

@@ -106,14 +106,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'.Str::studly($hydrator);
 
-            Coollection::macro($hydrator, function () use ($hydrator, $instance) {
+            Coollection::macro($hydrator, function() use ($hydrator, $instance) {
                 return $instance->getRepository()->getHydrator()->{$hydrator}($this);
             });
         }
@@ -179,8 +179,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);
         }
@@ -196,8 +196,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);
         }
@@ -228,8 +228,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/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/Cities.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 
         $this->helper->message('Processing cities...');
 
-        $normalizerClosure = function ($item) {
+        $normalizerClosure = function($item) {
             $item = $this->updater->addDataSource($item, 'natural');
 
             $item = $this->updater->addRecordType($item, 'city');
@@ -51,11 +51,11 @@ 
             return $this->updater->normalizeStateOrCityData($item);
         };
 
-        $codeGeneratorClosure = function ($item) {
+        $codeGeneratorClosure = function($item) {
             return $this->helper->caseForKey($item['nameascii']);
         };
 
-        $mergerClosure = function ($item) {
+        $mergerClosure = function($item) {
             return $item;
         };
 

src/update/Currencies.php

Spacing +4 added lines, -4 removed lines

@@ -47,13 +47,13 @@ 
             throw new Exception("No currencies found in {$directory}");
         }
 
-        $currencies = $currencies->mapWithKeys(function ($currency) {
+        $currencies = $currencies->mapWithKeys(function($currency) {
             return $currency;
         });
 
         $this->helper->message('Processing currencies...');
 
-        $normalizerClosure = function ($item) {
+        $normalizerClosure = function($item) {
             $item = $this->updater->addDataSource($item, 'world-currencies');
 
             $item = $this->updater->addRecordType($item, 'currency');
@@ -61,10 +61,10 @@ 
             return [$item];
         };
 
-        $getCodeClosure = function () {
+        $getCodeClosure = function() {
         };
 
-        $generateTaxData = function ($tax) {
+        $generateTaxData = function($tax) {
             return $tax;
         };
 

src/update/Taxes.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
 
         $taxes = $this->helper->loadJsonFiles($this->helper->dataDir('third-party/commerceguys/taxes/types'));
 
-        $taxes = $taxes->mapWithKeys(function ($vat, $key) {
+        $taxes = $taxes->mapWithKeys(function($vat, $key) {
             $parts = coollect(explode('_', $key));
             $cca2 = $parts->first();
             $type = $parts->last();
@@ -69,15 +69,15 @@ 
 
         $this->helper->message('Processing taxes...');
 
-        $normalizerClosure = function ($item) {
+        $normalizerClosure = function($item) {
             return $item;
         };
 
-        $getCodeClosure = function ($item) {
+        $getCodeClosure = function($item) {
             return $item['tax_type'];
         };
 
-        $generateTaxData = function ($tax) {
+        $generateTaxData = function($tax) {
             return $this->normalizeTax($tax);
         };
 

src/package/Services/Helper.php

Doc Comments +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
     /**
      * Load json files from dir.
      *
-     * @param $dir
+     * @param string $dir
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function loadJsonFiles($dir)
@@ -105,7 +105,7 @@ 
     }
 
     /**
-     * @param $contents
+     * @param string $contents
      * @return string
      */
     public function sanitizeFile($contents)

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
             throw new Exception('loadJson Error: File name not set');
         }
 
-        if (! file_exists($file) && ! file_exists($file = $this->dataDir("/$dir/".strtolower($file).'.json'))) {
+        if (!file_exists($file) && !file_exists($file = $this->dataDir("/$dir/".strtolower($file).'.json'))) {
             return coollect();
         }
 
@@ -69,7 +69,7 @@ 
      */
     public function loadJsonFiles($dir)
     {
-        return coollect(glob("$dir/*.json*"))->mapWithKeys(function ($file) {
+        return coollect(glob("$dir/*.json*"))->mapWithKeys(function($file) {
             $key = str_replace(['.json5', '.json'], '', basename($file));
 
             return [$key => $this->loadJson($file)];
@@ -84,7 +84,7 @@ 
      */
     public function moveFilesWildcard($from, $to)
     {
-        coollect(glob($this->dataDir($from)))->each(function ($from) use ($to) {
+        coollect(glob($this->dataDir($from)))->each(function($from) use ($to) {
             $this->mkDir($dir = $this->dataDir($to));
 
             rename($from, $dir.'/'.basename($from));

src/update/Countries.php

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\Services\Config;
 use PragmaRX\Countries\Package\Countries as CountriesService;
 use PragmaRX\Countries\Package\Services\Cache\Service as Cache;
+use PragmaRX\Countries\Package\Services\Config;
+use PragmaRX\Countries\Package\Support\Base;
 
 class Countries extends Base
 {

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);
@@ -104,12 +104,12 @@ 
 
         $this->helper->message('Generating countries...');
 
-        $countries = coollect($shapeFile)->map(function ($country) {
+        $countries = coollect($shapeFile)->map(function($country) {
             return $this->natural->fixNaturalOddCountries($country);
-        })->mapWithKeys(function ($natural) use ($mledoze, $dataDir) {
+        })->mapWithKeys(function($natural) use ($mledoze, $dataDir) {
             [$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];
             });
 
@@ -150,7 +150,7 @@ 
 
     public function clearCountryCurrencies($country)
     {
-        if (isset($country['currency']) && ! is_null($country['currency'])) {
+        if (isset($country['currency']) && !is_null($country['currency'])) {
             $country['currencies'] = $country['currency']->keys();
 
             unset($country['currency']);