antonioribeiro / countries

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);
@@ -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']);

src/package/Services/Countries.php

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/package/Data/Repository.php

Spacing +3 added lines, -3 removed lines

@@ -148,7 +148,7 @@ 
     {
         $this->countriesJson = $this->loadCountriesJson();
 
-        $overload = $this->helper->loadJsonFiles($this->helper->dataDir('countries/overload'))->mapWithKeys(function ($country, $code) {
+        $overload = $this->helper->loadJsonFiles($this->helper->dataDir('countries/overload'))->mapWithKeys(function($country, $code) {
             return [Str::upper($code) => $country];
         });
 
@@ -207,11 +207,11 @@ 
      */
     public function currencies()
     {
-        $currencies = $this->helper->loadJsonFiles($this->helper->dataDir('currencies/default'))->mapWithKeys(function ($country, $code) {
+        $currencies = $this->helper->loadJsonFiles($this->helper->dataDir('currencies/default'))->mapWithKeys(function($country, $code) {
             return [Str::upper($code) => $country];
         });
 
-        $overload = $this->helper->loadJsonFiles($this->helper->dataDir('currencies/overload'))->mapWithKeys(function ($country, $code) {
+        $overload = $this->helper->loadJsonFiles($this->helper->dataDir('currencies/overload'))->mapWithKeys(function($country, $code) {
             return [Str::upper($code) => $country];
         });
 

src/package/Services/Hydrator.php

Spacing +11 added lines, -11 removed lines

@@ -64,7 +64,7 @@ 
     protected function canHydrate($element, $enabled, $countryCode)
     {
         return ($enabled || $this->config->get('hydrate.elements.'.$element)) &&
-                ! isset($this->repository->countries[$countryCode]['hydrated'][$element]);
+                !isset($this->repository->countries[$countryCode]['hydrated'][$element]);
     }
 
     /**
@@ -72,7 +72,7 @@ 
      */
     protected function createHydrated($countryCode)
     {
-        if (! isset($this->repository->countries[$countryCode]['hydrated'])) {
+        if (!isset($this->repository->countries[$countryCode]['hydrated'])) {
             $this->repository->countries[$countryCode]['hydrated'] = [];
         }
 
@@ -81,7 +81,7 @@ 
 
     protected function fixCurrencies($country)
     {
-        if (! isset($country['currencies']) && isset($country['currency'])) {
+        if (!isset($country['currencies']) && isset($country['currency'])) {
             $country['currencies'] = $country['currency'];
         }
 
@@ -98,7 +98,7 @@ 
     private function hydrateCountries($countries, $elements = null)
     {
         return countriesCollect(
-            $countries->map(function ($country) use ($elements) {
+            $countries->map(function($country) use ($elements) {
                 return $this->hydrateCountry($country, $elements);
             })
         );
@@ -192,7 +192,7 @@ 
      */
     protected function needsHydration($countryCode, $element, $enabled = false)
     {
-        if (! $this->canHydrate($element, $enabled, $countryCode)) {
+        if (!$this->canHydrate($element, $enabled, $countryCode)) {
             return false;
         }
 
@@ -305,7 +305,7 @@ 
     public function hydrateBorders($country)
     {
         $country['borders'] = isset($country['borders'])
-            ? $country['borders'] = countriesCollect($country['borders'])->map(function ($border) {
+            ? $country['borders'] = countriesCollect($country['borders'])->map(function($border) {
                 return $this->repository->call('where', ['cca3', $border])->first();
             })
             : countriesCollect();
@@ -334,7 +334,7 @@ 
     {
         $country = $this->hydrateTimezones($country);
 
-        $country['timezones'] = $country->timezones->map(function ($timezone) {
+        $country['timezones'] = $country->timezones->map(function($timezone) {
             return $timezone->overwrite(['times' => $this->repository->findTimezoneTime($timezone['zone_id'])]);
         });
 
@@ -354,7 +354,7 @@ 
         $country = $this->fixCurrencies($country);
 
         if (isset($country['currencies'])) {
-            $currencies = countriesCollect($country['currencies'])->mapWithKeys(function ($code, $currencyCode) {
+            $currencies = countriesCollect($country['currencies'])->mapWithKeys(function($code, $currencyCode) {
                 if ($this->isCurrenciesArray($code)) {
                     return [
                         $code['ISO4217Code'] => $code,
@@ -415,7 +415,7 @@ 
      */
     public function addCountry($countryCode, $country)
     {
-        if (! isset($this->repository->countries[$countryCode])) {
+        if (!isset($this->repository->countries[$countryCode])) {
             $this->repository->countries[$countryCode] = $country;
         }
     }
@@ -442,14 +442,14 @@ 
      */
     protected function checkHydrationElements($elements)
     {
-        $elements = countriesCollect($elements)->mapWithKeys(function ($value, $key) {
+        $elements = countriesCollect($elements)->mapWithKeys(function($value, $key) {
             if (is_numeric($key)) {
                 $key = $value;
                 $value = true;
             }
 
             return [$key => $value];
-        })->filter(function ($element) {
+        })->filter(function($element) {
             return $element;
         });
 

src/update/Updater.php

Spacing +10 added lines, -10 removed lines

@@ -209,7 +209,7 @@ 
             $record = $record->toArray();
         }
 
-        if (! isset($record[$field = 'data_sources'])) {
+        if (!isset($record[$field = 'data_sources'])) {
             $record['data_sources'] = [];
         }
 
@@ -267,7 +267,7 @@ 
         foreach ($fields as $field) {
             $found = $on->where($field[0], $by[$field[1]])->first();
 
-            if (isset($by[$field[1]]) && ! is_null($found) && $found->count() > 0) {
+            if (isset($by[$field[1]]) && !is_null($found) && $found->count() > 0) {
                 return [coollect($found), $found->{$codeField}];
             }
         }
@@ -285,19 +285,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;
                 });
 
@@ -351,13 +351,13 @@ 
         return $this->cache->remember(
             'normalizeData'.$dir,
             160,
-            function () use ($result, $normalizerClosure, &$counter) {
-                return coollect($result)->map(function ($item, $key) use ($normalizerClosure, &$counter) {
+            function() use ($result, $normalizerClosure, &$counter) {
+                return coollect($result)->map(function($item, $key) use ($normalizerClosure, &$counter) {
                     if ($counter++ % 1000 === 0) {
                         $this->helper->message("Normalized: {$counter}");
                     }
 
-                    return $normalizerClosure(coollect($item)->mapWithKeys(function ($value, $key) {
+                    return $normalizerClosure(coollect($item)->mapWithKeys(function($value, $key) {
                         return [strtolower($key) => $value];
                     }), $key);
                 });
@@ -386,7 +386,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

@@ -60,7 +60,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]]]);
 
@@ -112,7 +112,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']);
@@ -124,12 +124,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);
         });
     }

src/update/Helper.php

Spacing +19 added lines, -19 removed lines

@@ -163,7 +163,7 @@ 
      */
     public function download($url, $directory)
     {
-        coollect((array) $url)->each(function ($url) use ($directory) {
+        coollect((array) $url)->each(function($url) use ($directory) {
             $filename = basename($url);
 
             $destination = $this->toDir("{$directory}/{$filename}");
@@ -220,7 +220,7 @@ 
 
         $fw = $this->fopenOrFail($destination, 'w');
 
-        while (! feof($fr)) {
+        while (!feof($fr)) {
             fwrite($fw, fread($fr, 4096));
             flush();
         }
@@ -241,7 +241,7 @@ 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function ($resource, $total, $downloaded) use (&$nextStep) {
+        curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($resource, $total, $downloaded) use (&$nextStep) {
             if ($downloaded > $nextStep) {
                 echo '.';
                 $nextStep += 8192;
@@ -266,7 +266,7 @@ 
     protected function renameMasterToPackage($file, $subPath, $path, $exclude)
     {
         if (Str::endsWith($file, 'master.zip')) {
-            $dir = coollect(scandir($path))->filter(function ($file) use ($exclude) {
+            $dir = coollect(scandir($path))->filter(function($file) use ($exclude) {
                 return $file !== '.' && $file !== '..' && $file !== $exclude;
             })->first();
 
@@ -282,7 +282,7 @@ 
     {
         $path = dirname($file);
 
-        if (! Str::endsWith($file, '.zip') || file_exists($subPath = "$path/$subPath")) {
+        if (!Str::endsWith($file, '.zip') || file_exists($subPath = "$path/$subPath")) {
             return;
         }
 
@@ -312,7 +312,7 @@ 
      */
     public function delTree($dir)
     {
-        if (! file_exists($dir)) {
+        if (!file_exists($dir)) {
             return false;
         }
 
@@ -350,9 +350,9 @@ 
 
         unset($shapeRecords);
 
-        return coollect($result)->mapWithKeys(function ($fields, $key1) {
+        return coollect($result)->mapWithKeys(function($fields, $key1) {
             return [
-                strtolower($key1) => coollect($fields)->mapWithKeys(function ($value, $key2) {
+                strtolower($key1) => coollect($fields)->mapWithKeys(function($value, $key2) {
                     return [strtolower($key2) => $value];
                 }),
             ];
@@ -371,7 +371,7 @@ 
 
         $array = arrayable($array) ? $array->toArray() : $array;
 
-        array_walk($array, function ($value, $key) use (&$result) {
+        array_walk($array, function($value, $key) use (&$result) {
             $result[Str::snake($key)] = arrayable($value) || is_array($value)
                 ? $this->arrayKeysSnakeRecursive($value)
                 : $value;
@@ -399,7 +399,7 @@ 
      */
     public function fixUtf8($string)
     {
-        return preg_replace_callback('/\\\\u([0-9a-fA-F]{4})/', function ($match) {
+        return preg_replace_callback('/\\\\u([0-9a-fA-F]{4})/', function($match) {
             return mb_convert_encoding(pack('H*', $match[1]), 'UTF-8', 'UCS-2BE');
         }, $string);
     }
@@ -435,9 +435,9 @@ 
      */
     public function downloadDataFiles()
     {
-        $this->config->get('downloadable')->each(function ($urls, $path) {
-            if (! file_exists($destination = $this->dataDir("third-party/$path"))) {
-                coollect($urls)->each(function ($url) use ($destination) {
+        $this->config->get('downloadable')->each(function($urls, $path) {
+            if (!file_exists($destination = $this->dataDir("third-party/$path"))) {
+                coollect($urls)->each(function($url) use ($destination) {
                     $this->download($url, $destination);
 
                     $file = basename($url);
@@ -507,7 +507,7 @@ 
      */
     public function loadJsonFiles($dir)
     {
-        return coollect(glob("$dir/*.json*"))->mapWithKeys(function ($file) {
+        return coollect(glob("$dir/*.json*"))->mapWithKeys(function($file) {
             $key = str_replace('.json', '', str_replace('.json5', '', basename($file)));
 
             return [$key => $this->loadJson($file)];
@@ -540,7 +540,7 @@ 
      */
     public function moveDataFiles()
     {
-        $this->config->get('moveable')->each(function ($to, $from) {
+        $this->config->get('moveable')->each(function($to, $from) {
             $this->moveDataFile($from, $to);
         });
     }
@@ -569,7 +569,7 @@ 
      */
     public function message($message, $type = 'line')
     {
-        if (! is_null($this->command)) {
+        if (!is_null($this->command)) {
             $this->command->{$type}($message);
         }
     }
@@ -600,7 +600,7 @@ 
             $this->abort('loadCsv Error: File name not set');
         }
 
-        if (! file_exists($file)) {
+        if (!file_exists($file)) {
             $file = $this->dataDir($this->addSuffix('.csv', "/$dir/".strtolower($file)));
         }
 
@@ -616,7 +616,7 @@ 
      */
     public function makeJsonFileName($key, $dir = '')
     {
-        if (! Str::endsWith($dir, DIRECTORY_SEPARATOR)) {
+        if (!Str::endsWith($dir, DIRECTORY_SEPARATOR)) {
             $dir .= DIRECTORY_SEPARATOR;
         }
 
@@ -697,7 +697,7 @@ 
     {
         $this->progress('--- Delete temporary files');
 
-        $this->config->get('deletable')->each(function ($directory) {
+        $this->config->get('deletable')->each(function($directory) {
             if (file_exists($directory = $this->dataDir($directory))) {
                 $this->deleteDirectory($directory);
             }

src/update/Timezones.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
         $countries = $this->cache->remember(
             'updateTimezone.countries',
             160,
-            function () {
+            function() {
                 return $this->helper->loadCsv($this->helper->dataDir('third-party/timezonedb/country.csv'));
             }
         );
@@ -61,8 +61,8 @@ 
         $zones = $this->cache->remember(
             'updateTimezone.zones',
             160,
-            function () {
-                return $this->helper->loadCsv($this->helper->dataDir('third-party/timezonedb/zone.csv'))->mapWithKeys(function ($value) {
+            function() {
+                return $this->helper->loadCsv($this->helper->dataDir('third-party/timezonedb/zone.csv'))->mapWithKeys(function($value) {
                     return [
                         $value[0] => [
                             'zone_id' => $value[0],
@@ -79,8 +79,8 @@ 
         $timezones = $this->cache->remember(
             'updateTimezone.timezones',
             160,
-            function () {
-                return $this->helper->loadCsv($this->helper->dataDir('third-party/timezonedb/timezone.csv'))->map(function ($timezone) {
+            function() {
+                return $this->helper->loadCsv($this->helper->dataDir('third-party/timezonedb/timezone.csv'))->map(function($timezone) {
                     return [
                         'zone_id' => $timezone[0],
                         'abbreviation' => $timezone[1],
@@ -97,9 +97,9 @@ 
         $abbreviations = $this->cache->remember(
             'updateTimezone.abbreviations',
             160,
-            function () use ($timezones) {
-                return $timezones->groupBy('zone_id')->map(function (Coollection $timezones) {
-                    return $timezones->map(function ($timezone) {
+            function() use ($timezones) {
+                return $timezones->groupBy('zone_id')->map(function(Coollection $timezones) {
+                    return $timezones->map(function($timezone) {
                         return $timezone['abbreviation'];
                     })->unique()->sort()->values();
                 });
@@ -108,13 +108,13 @@ 
 
         $this->helper->progress('Updating countries timezones...');
 
-        $countries = $countries->mapWithKeys(function ($item) {
+        $countries = $countries->mapWithKeys(function($item) {
             return [$item[0] => [
                 'cca2' => $item[0],
                 'name' => $item[1],
             ]];
         })
-        ->mapWithKeys(function ($item, $cca2) {
+        ->mapWithKeys(function($item, $cca2) {
             $fields = [
                 ['cca2', 'cca2'],
                 ['name.common', 'name'],
@@ -134,8 +134,8 @@ 
                     'name' => $item['name'],
                 ],
             ];
-        })->map(function ($country) use ($zones, $abbreviations) {
-            $country['timezones'] = $zones->where('country_code', $country['cca2'])->mapWithKeys(function ($zone) use ($abbreviations, $country) {
+        })->map(function($country) use ($zones, $abbreviations) {
+            $country['timezones'] = $zones->where('country_code', $country['cca2'])->mapWithKeys(function($zone) use ($abbreviations, $country) {
                 $zone['abbreviations'] = $abbreviations[$zone['zone_id']];
 
                 $zone['cca3'] = isset($country['cca3']) ? $country['cca3'] : null;
@@ -154,14 +154,14 @@ 
 
         $this->helper->message('Generating timezone files...');
 
-        $getCountryCodeClosure = function () {
+        $getCountryCodeClosure = function() {
         };
 
-        $normalizeCountryClosure = function ($country) {
+        $normalizeCountryClosure = function($country) {
             return [$country['timezones']];
         };
 
-        $dummyClosure = function ($country) {
+        $dummyClosure = function($country) {
             return $country;
         };
 

src/package/Services/Cache/Service.php

Spacing +5 added lines, -5 removed lines

@@ -124,7 +124,7 @@ 
      * @param  null  $ttl
      * @return bool
      */
-    public function set(string $key, mixed $value, DateInterval|int|null $ttl = null): bool
+    public function set(string $key, mixed $value, DateInterval | int | null $ttl = null): bool
     {
         if ($this->enabled()) {
             return $this->manager->set($key, $value, $ttl);
@@ -159,7 +159,7 @@ 
      * @param  null  $default
      * @return array
      */
-    public function getMultiple(Traversable|array $keys, mixed $default = null): Traversable|array
+    public function getMultiple(Traversable | array $keys, mixed $default = null): Traversable | array
     {
         return $this->manager->getMultiple($keys, $default);
     }
@@ -171,7 +171,7 @@ 
      * @param  null  $ttl
      * @return bool
      */
-    public function setMultiple(Traversable|array $values, DateInterval|int|null $ttl = null): bool
+    public function setMultiple(Traversable | array $values, DateInterval | int | null $ttl = null): bool
     {
         return $this->manager->setMultiple($keys, $ttl);
     }
@@ -182,7 +182,7 @@ 
      * @param  $keys
      * @return bool|void
      */
-    public function deleteMultiple(Traversable|array $keys): bool
+    public function deleteMultiple(Traversable | array $keys): bool
     {
         $this->manager->deleteMultiple($keys);
     }
@@ -208,7 +208,7 @@ 
      */
     public function remember($key, $minutes, Closure $callback)
     {
-        if (! \is_null($value = $this->manager->get($key))) {
+        if (!\is_null($value = $this->manager->get($key))) {
             return $value;
         }