antonioribeiro / countries

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/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): void
     {
         if (ends_with($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 (! ends_with($file, '.zip') || file_exists($subPath = "$path/$subPath")) {
+        if (!ends_with($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);
@@ -485,7 +485,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)];
@@ -518,7 +518,7 @@ 
      */
     public function moveDataFiles()
     {
-        $this->config->get('moveable')->each(function ($to, $from) {
+        $this->config->get('moveable')->each(function($to, $from) {
             $this->moveDataFile($from, $to);
         });
     }
@@ -547,7 +547,7 @@ 
      */
     public function message($message, $type = 'line')
     {
-        if (! is_null($this->command)) {
+        if (!is_null($this->command)) {
             $this->command->{$type}($message);
         }
     }
@@ -577,7 +577,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)));
         }
 
@@ -593,7 +593,7 @@ 
      */
     public function makeJsonFileName($key, $dir = '')
     {
-        if (! ends_with($dir, (DIRECTORY_SEPARATOR))) {
+        if (!ends_with($dir, (DIRECTORY_SEPARATOR))) {
             $dir .= DIRECTORY_SEPARATOR;
         }
 
@@ -674,7 +674,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);
             }

Doc Comments +18 added lines, -13 removed lines

@@ -70,9 +70,9 @@ 
     /**
      * Add suffix to string.
      *
-     * @param $suffix
-     * @param $string
-     * @return mixed
+     * @param string string
+     * @param string $string
+     * @return string
      */
     protected function addSuffix($suffix, $string)
     {
@@ -99,7 +99,7 @@ 
     /**
      * Delete a whole directory.
      *
-     * @param $dir
+     * @param string $dir
      */
     protected function deleteDirectory($dir)
     {
@@ -117,6 +117,11 @@ 
         rmdir($dir);
     }
 
+    /**
+     * @param string $string
+     *
+     * @return resource
+     */
     protected function fopenOrFail($url, $string)
     {
         if (($handle = @fopen($url, $string)) === false) {
@@ -185,7 +190,7 @@ 
 
     /**
      * @param $url
-     * @param $destination
+     * @param string $destination
      */
     public function downloadFile($url, $destination)
     {
@@ -256,8 +261,8 @@ 
     /**
      * @param $file
      * @param $subPath
-     * @param $path
-     * @param $exclude
+     * @param string $path
+     * @param string $exclude
      */
     protected function renameMasterToPackage($file, $subPath, $path, $exclude): void
     {
@@ -311,8 +316,8 @@ 
     /**
      * Load a shapeFile.
      *
-     * @param $dir
-     * @return \PragmaRX\Coollection\Package\Coollection
+     * @param string $dir
+     * @return string
      */
     public function shapeFile($dir)
     {
@@ -392,7 +397,7 @@ 
      * Unzip a file.
      *
      * @param $file
-     * @param $path
+     * @param string $path
      */
     public function unzip($file, $path)
     {
@@ -480,7 +485,7 @@ 
     /**
      * Load json files from dir.
      *
-     * @param $dir
+     * @param string $dir
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function loadJsonFiles($dir)
@@ -566,7 +571,7 @@ 
     /**
      * Loads a json file.
      *
-     * @param $file
+     * @param string $file
      * @param string $dir
      * @return \PragmaRX\Coollection\Package\Coollection
      * @throws \Exception
@@ -603,7 +608,7 @@ 
     /**
      * Put contents into a file.
      *
-     * @param $file
+     * @param string $file
      * @param $contents
      */
     public function putFile($file, $contents)

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

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

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

Spacing +3 added lines, -3 removed lines

@@ -108,7 +108,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 [upper($code) => $country];
         });
 
@@ -161,11 +161,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 [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 [upper($code) => $country];
         });
 

Doc Comments +2 added lines, -2 removed lines

@@ -59,10 +59,10 @@
     /**
      * Repository constructor.
      *
-     * @param CacheContract $cache
+     * @param Cache $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)
     {

src/package/Services/Helper.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,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();
         }
 
@@ -70,7 +70,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)];
@@ -85,7 +85,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));

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)

src/package/Support/Base.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 {
     public function defineConstants()
     {
-        if (! defined('__COUNTRIES_DIR__')) {
+        if (!defined('__COUNTRIES_DIR__')) {
             define(
                 '__COUNTRIES_DIR__',
                 realpath(

src/package/Services/Cache.php

Doc Comments +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
      * Delete an item from the cache by its unique key.
      *
      * @param string $key
-     * @return bool
+     * @return boolean|null
      */
     public function delete($key)
     {
@@ -207,7 +207,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 +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

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

src/update/Updater.php

Doc Comments +4 added lines, -4 removed lines

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

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

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

Spacing +10 added lines, -10 removed lines

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

src/package/Services/Cache/Managers/Nette.php

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,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);
             }
         }
@@ -143,7 +143,7 @@ 
      */
     public function getMultiple($keys, $default = null)
     {
-        return coollect($keys)->map(function ($key) {
+        return coollect($keys)->map(function($key) {
             return $this->get($key);
         });
     }
@@ -157,7 +157,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);
         });
     }
@@ -170,7 +170,7 @@ 
      */
     public function deleteMultiple($keys)
     {
-        coollect($keys)->map(function ($key) {
+        coollect($keys)->map(function($key) {
             $this->forget($key);
         });
     }
@@ -183,7 +183,7 @@ 
      */
     public function has($key)
     {
-        return ! is_null($this->get($key));
+        return !is_null($this->get($key));
     }
 
     /**
@@ -215,7 +215,7 @@ 
     {
         $value = $this->get($key);
 
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             return $value;
         }
 

Doc Comments +1 added lines, -1 removed lines

@@ -134,7 +134,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
 {