antonioribeiro / countries

src/update/Timezones.php

Spacing +15 added lines, -15 removed lines

@@ -50,7 +50,7 @@ 
         $countries = $this->cache->remember(
             'updateTimezone.countries',
             160,
-            function () {
+            function() {
                 return $this->helper->loadCsv($this->helper->dataDir('third-party/timezonedb/country.csv'));
             }
         );
@@ -60,8 +60,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],
@@ -78,8 +78,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],
@@ -96,9 +96,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();
                 });
@@ -107,13 +107,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'],
@@ -133,8 +133,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;
@@ -153,14 +153,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;
         };
 

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

Indentation +8 added lines, -8 removed lines

@@ -115,9 +115,9 @@ 
         })
         ->mapWithKeys(function ($item, $cca2) {
             $fields = [
-               ['cca2', 'cca2'],
-               ['name.common', 'name'],
-               ['name.official', 'name'],
+                ['cca2', 'cca2'],
+                ['name.common', 'name'],
+                ['name.official', 'name'],
             ];
 
             [$country] = $this->updater->findByFields($this->updater->getCountries(), $item, $fields, 'cca2');
@@ -127,11 +127,11 @@ 
             }
 
             return [
-               $country->cca3 => [
-                   'cca2' => $country->cca2,
-                   'cca3' => $country->cca3,
-                   'name' => $item['name'],
-               ],
+                $country->cca3 => [
+                    'cca2' => $country->cca2,
+                    'cca3' => $country->cca3,
+                    'name' => $item['name'],
+                ],
             ];
         })->map(function ($country) use ($zones, $abbreviations) {
             $country['timezones'] = $zones->where('country_code', $country['cca2'])->mapWithKeys(function ($zone) use ($abbreviations, $country) {

src/package/Data/Repository.php

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
      * @param CacheContract $cache
      * @param Hydrator $hydrator
      * @param Helper $helper
-     * @param object $config
+     * @param \PragmaRX\Countries\Package\Services\Config $config
      */
     public function __construct(CacheContract $cache, Hydrator $hydrator, Helper $helper, $config)
     {
@@ -179,7 +179,7 @@ 
      * Load currency json file.
      *
      * @param $code
-     * @return string
+     * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function loadCurrenciesForCountry($code)
     {
@@ -311,7 +311,7 @@ 
      * Find a country timezone.
      *
      * @param $countryCode
-     * @return null
+     * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function findTimezones($countryCode)
     {

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

@@ -3,10 +3,10 @@
 namespace PragmaRX\Countries\Package\Data;
 
 use IlluminateAgnostic\Str\Support\Str;
+use PragmaRX\Countries\Package\Services\Cache\Service as Cache;
 use PragmaRX\Countries\Package\Services\Helper;
 use PragmaRX\Countries\Package\Services\Hydrator;
 use Psr\SimpleCache\CacheInterface as CacheContract;
-use PragmaRX\Countries\Package\Services\Cache\Service as Cache;
 
 class Repository
 {

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/Cache/Managers/Nette.php

Doc Comments +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
     /**
      * Check if cache is enabled.
      *
-     * @return bool
+     * @return \PragmaRX\Coollection\Package\Coollection
      */
     protected function enabled()
     {
@@ -135,7 +135,7 @@ 
      * Delete an item from the cache by its unique key.
      *
      * @param string $key
-     * @return bool
+     * @return boolean|null
      */
     public function delete($key)
     {

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

@@ -3,10 +3,10 @@
 namespace PragmaRX\Countries\Package\Services\Cache\Managers;
 
 use Closure;
-use Psr\SimpleCache\CacheInterface;
 use Nette\Caching\Cache as NetteCache;
 use Nette\Caching\Storages\FileStorage;
 use PragmaRX\Countries\Package\Services\Config;
+use Psr\SimpleCache\CacheInterface;
 
 class Nette implements CacheInterface
 {

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
         if (\is_null($this->dir)) {
             $this->dir = $this->config->cache->directory ?: sys_get_temp_dir().'/__PRAGMARX_COUNTRIES__/cache';
 
-            if (! file_exists($this->dir)) {
+            if (!file_exists($this->dir)) {
                 mkdir($this->dir, 0755, true);
             }
         }
@@ -153,7 +153,7 @@ 
      */
     public function getMultiple($keys, $default = null)
     {
-        return coollect($keys)->map(function ($key) {
+        return coollect($keys)->map(function($key) {
             return $this->get($key);
         });
     }
@@ -167,7 +167,7 @@ 
      */
     public function setMultiple($values, $ttl = null)
     {
-        return coollect($values)->map(function ($value, $key) use ($ttl) {
+        return coollect($values)->map(function($value, $key) use ($ttl) {
             return $this->set($key, $value, $ttl);
         });
     }
@@ -180,7 +180,7 @@ 
      */
     public function deleteMultiple($keys)
     {
-        coollect($keys)->map(function ($key) {
+        coollect($keys)->map(function($key) {
             $this->forget($key);
         });
     }
@@ -193,7 +193,7 @@ 
      */
     public function has($key)
     {
-        return ! \is_null($this->get($key));
+        return !\is_null($this->get($key));
     }
 
     /**
@@ -208,7 +208,7 @@ 
     {
         $value = $this->get($key);
 
-        if (! \is_null($value)) {
+        if (!\is_null($value)) {
             return $value;
         }
 

src/package/Services/Hydrator.php

Doc Comments +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
     /**
      * Hydrator constructor.
      *
-     * @param object $config
+     * @param Config $config
      */
     public function __construct($config)
     {
@@ -57,7 +57,7 @@ 
      * Can hydrate?
      *
      * @param $element
-     * @param $enabled
+     * @param boolean $enabled
      * @param $countryCode
      * @return bool
      */
@@ -93,7 +93,7 @@ 
      *
      * @param $countries
      * @param $elements
-     * @return mixed
+     * @return \PragmaRX\Countries\Package\Support\Collection
      */
     private function hydrateCountries($countries, $elements = null)
     {
@@ -109,7 +109,7 @@ 
      *
      * @param $country
      * @param $elements
-     * @return mixed
+     * @return \PragmaRX\Countries\Package\Support\Collection
      */
     private function hydrateCountry($country, $elements)
     {
@@ -285,7 +285,7 @@ 
      * Hydrate flag.
      *
      * @param $country
-     * @return mixed
+     * @return Coollection
      */
     public function hydrateFlag($country)
     {
@@ -396,7 +396,7 @@ 
      * Get country by country code.
      *
      * @param $countryCode
-     * @return mixed
+     * @return \PragmaRX\Countries\Package\Support\Collection
      */
     public function getCountry($countryCode)
     {
@@ -455,7 +455,7 @@ 
     /**
      * Repository setter.
      *
-     * @param $repository
+     * @param \PragmaRX\Countries\Package\Data\Repository $repository
      */
     public function setRepository($repository)
     {

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) use ($country) {
+            $currencies = countriesCollect($country['currencies'])->mapWithKeys(function($code, $currencyCode) use ($country) {
                 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/Nationality.php

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 Nationality extends Base
 {

Doc Comments +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
     /**
      * Fill mledoze fields with natural earth vector data.
      *
-     * @param $fields
+     * @param Coollection $fields
      * @return mixed
      */
     public function fillMledozeFields($fields)
@@ -83,7 +83,7 @@ 
      *
      * @param Coollection $mledoze
      * @param Coollection $natural
-     * @return array
+     * @return Coollection[]
      */
     public function findMledozeCountry($mledoze, $natural)
     {

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

Doc Comments +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
 
     /**
      * Updater constructor.
-     * @param object $config
+     * @param ConfigService $config
      * @param Helper $helper
      */
     public function __construct($config, Helper $helper)
@@ -131,7 +131,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return Command
      */
     public function getCommand()
     {
@@ -219,8 +219,8 @@ 
     }
 
     /**
-     * @param $result
-     * @param $type
+     * @param Coollection $result
+     * @param string $type
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function addRecordType($result, $type)
@@ -259,7 +259,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)
@@ -341,7 +341,7 @@ 
     /**
      * @param $result
      * @param $dir
-     * @param $normalizerClosure
+     * @param Closure $normalizerClosure
      * @return array
      */
     public function normalizeData($result, $dir, $normalizerClosure)

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 ($dir, $result, $normalizerClosure, &$counter) {
-                return coollect($result)->map(function ($item, $key) use ($normalizerClosure, &$counter) {
+            function() use ($dir, $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'];
 

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

@@ -3,12 +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;
-use PragmaRX\Countries\Package\Services\Command;
 use PragmaRX\Countries\Package\Services\Cache\Service as Cache;
+use PragmaRX\Countries\Package\Services\Command;
 use PragmaRX\Countries\Package\Services\Config as ConfigService;
+use PragmaRX\Countries\Package\Support\Base;
 
 /**
  * @codeCoverageIgnore

src/update/States.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 
         $this->helper->message('Processing states...');
 
-        $normalizerClosure = function ($item) {
+        $normalizerClosure = function($item) {
             $item = $this->updater->addDataSource($item, 'natural');
 
             $item = $this->updater->addRecordType($item, 'state');
@@ -56,13 +56,13 @@ 
             return $this->updater->normalizeStateOrCityData($item);
         };
 
-        $getCodeClosure = function ($item) {
+        $getCodeClosure = function($item) {
             return $this->makeStatePostalCode($item);
         };
 
         $counter = 0;
 
-        $mergerClosure = function ($states) use (&$counter) {
+        $mergerClosure = function($states) use (&$counter) {
             if ($counter++ % 100 === 0) {
                 $this->helper->message("Processed: $counter");
             }
@@ -93,7 +93,7 @@ 
             }
         }
 
-        if (! empty(trim($item->postal))) {
+        if (!empty(trim($item->postal))) {
             $item->postal;
         }
 

src/update/Helper.php

Doc Comments +17 added lines, -12 removed lines

@@ -69,9 +69,9 @@ 
     /**
      * Add suffix to string.
      *
-     * @param $suffix
-     * @param $string
-     * @return mixed
+     * @param string string
+     * @param string $string
+     * @return string
      */
     protected function addSuffix($suffix, $string)
     {
@@ -98,7 +98,7 @@ 
     /**
      * Delete a whole directory.
      *
-     * @param $dir
+     * @param string $dir
      */
     protected function deleteDirectory($dir)
     {
@@ -116,6 +116,11 @@ 
         rmdir($dir);
     }
 
+    /**
+     * @param string $string
+     *
+     * @return resource
+     */
     protected function fopenOrFail($url, $string)
     {
         if (($handle = @fopen($url, $string)) === false) {
@@ -184,7 +189,7 @@ 
 
     /**
      * @param $url
-     * @param $destination
+     * @param string $destination
      */
     public function downloadFile($url, $destination)
     {
@@ -255,8 +260,8 @@ 
     /**
      * @param $file
      * @param $subPath
-     * @param $path
-     * @param $exclude
+     * @param string $path
+     * @param string $exclude
      */
     protected function renameMasterToPackage($file, $subPath, $path, $exclude)
     {
@@ -310,7 +315,7 @@ 
     /**
      * Load a shapeFile.
      *
-     * @param $dir
+     * @param string $dir
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function shapeFile($dir)
@@ -391,7 +396,7 @@ 
      * Unzip a file.
      *
      * @param $file
-     * @param $path
+     * @param string $path
      */
     public function unzip($file, $path)
     {
@@ -483,7 +488,7 @@ 
     /**
      * Load json files from dir.
      *
-     * @param $dir
+     * @param string $dir
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function loadJsonFiles($dir)
@@ -569,7 +574,7 @@ 
     /**
      * Loads a json file.
      *
-     * @param $file
+     * @param string $file
      * @param string $dir
      * @return \PragmaRX\Coollection\Package\Coollection
      * @throws \Exception
@@ -606,7 +611,7 @@ 
     /**
      * Put contents into a file.
      *
-     * @param $file
+     * @param string $file
      * @param $contents
      */
     public function putFile($file, $contents)

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

@@ -3,13 +3,13 @@
 namespace PragmaRX\Countries\Update;
 
 use Exception;
-use ReflectionClass;
-use ShapeFile\ShapeFile;
-use RecursiveIteratorIterator;
-use RecursiveDirectoryIterator;
 use IlluminateAgnostic\Str\Support\Str;
 use PragmaRX\Countries\Package\Services\Command;
 use PragmaRX\Countries\Package\Services\Helper as ServiceHelper;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use ReflectionClass;
+use ShapeFile\ShapeFile;
 
 class Helper
 {

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[snake_case($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 ($path, $destination) {
+        $this->config->get('downloadable')->each(function($urls, $path) {
+            if (!file_exists($destination = $this->dataDir("third-party/$path"))) {
+                coollect($urls)->each(function($url) use ($path, $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);
             }

src/package/Services/Cache/Service.php

Doc Comments +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
     /**
      * Check if cache is enabled.
      *
-     * @return bool
+     * @return \PragmaRX\Coollection\Package\Coollection
      */
     protected function enabled()
     {
@@ -132,7 +132,7 @@ 
      * Delete an item from the cache by its unique key.
      *
      * @param string $key
-     * @return bool
+     * @return boolean|null
      */
     public function delete($key)
     {
@@ -197,7 +197,7 @@ 
      * Get an item from the cache, or store the default value.
      *
      * @param  string $key
-     * @param  \DateTimeInterface|\DateInterval|float|int $minutes
+     * @param  integer $minutes
      * @param Closure $callback
      * @return mixed
      */

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

@@ -3,9 +3,9 @@
 namespace PragmaRX\Countries\Package\Services\Cache;
 
 use Closure;
-use Psr\SimpleCache\CacheInterface;
-use PragmaRX\Countries\Package\Services\Config;
 use PragmaRX\Countries\Package\Services\Cache\Managers\Nette as NetteManager;
+use PragmaRX\Countries\Package\Services\Config;
+use Psr\SimpleCache\CacheInterface;
 
 class Service implements CacheInterface
 {

Spacing +1 added lines, -1 removed lines

@@ -202,7 +202,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;
         }