antonioribeiro / countries

src/package/Services/Helper.php

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/Nationality.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function load()
     {
-        $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');
@@ -89,7 +89,7 @@ 
     {
         [$country, $countryCode] = $this->updater->findCountryByAnyField($mledoze, $natural);
 
-        if (! $country->isEmpty()) {
+        if (!$country->isEmpty()) {
             return [coollect($this->helper->arrayKeysSnakeRecursive($country)), $countryCode];
         }
 
@@ -137,7 +137,7 @@ 
             $result[$key] = $mledozeValue; // Natural Earth Vector
         }
 
-        return coollect($result)->sortBy(function ($value, $key) {
+        return coollect($result)->sortBy(function($value, $key) {
             return $key;
         });
     }

src/update/Mledoze.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,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');
@@ -97,7 +97,7 @@ 
     {
         [$country, $countryCode] = $this->updater->findCountryByAnyField($mledoze, $natural);
 
-        if (! $country->isEmpty()) {
+        if (!$country->isEmpty()) {
             return [coollect($this->helper->arrayKeysSnakeRecursive($country)), $countryCode];
         }
 
@@ -156,7 +156,7 @@ 
 
         $result = $this->makeFlag($result);
 
-        return coollect($result)->sortBy(function ($value, $key) {
+        return coollect($result)->sortBy(function($value, $key) {
             return $key;
         });
     }

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/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/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/Helper.php

Spacing +19 added lines, -19 removed lines

@@ -159,7 +159,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}");
@@ -216,7 +216,7 @@ 
 
         $fw = $this->fopenOrFail($destination, 'w');
 
-        while (! feof($fr)) {
+        while (!feof($fr)) {
             fwrite($fw, fread($fr, 4096));
             flush();
         }
@@ -237,7 +237,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;
@@ -262,7 +262,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();
 
@@ -278,7 +278,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;
         }
 
@@ -297,7 +297,7 @@ 
      */
     public function delTree($dir)
     {
-        if (! file_exists($dir)) {
+        if (!file_exists($dir)) {
             return false;
         }
 
@@ -334,9 +334,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];
                 }),
             ];
@@ -355,7 +355,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;
@@ -383,7 +383,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);
     }
@@ -419,9 +419,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);
@@ -491,7 +491,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)];
@@ -524,7 +524,7 @@ 
      */
     public function moveDataFiles()
     {
-        $this->config->get('moveable')->each(function ($to, $from) {
+        $this->config->get('moveable')->each(function($to, $from) {
             $this->moveDataFile($from, $to);
         });
     }
@@ -553,7 +553,7 @@ 
      */
     public function message($message, $type = 'line')
     {
-        if (! is_null($this->command)) {
+        if (!is_null($this->command)) {
             $this->command->{$type}($message);
         }
     }
@@ -583,7 +583,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)));
         }
 
@@ -599,7 +599,7 @@ 
      */
     public function makeJsonFileName($key, $dir = '')
     {
-        if (! Str::endsWith($dir, (DIRECTORY_SEPARATOR))) {
+        if (!Str::endsWith($dir, (DIRECTORY_SEPARATOR))) {
             $dir .= DIRECTORY_SEPARATOR;
         }
 
@@ -680,7 +680,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);
             }