antonioribeiro / countries

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

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
     /**
      * Build countries collection.
      *
-     * @param $dataDir
+     * @param string $dataDir
      * @return \PragmaRX\Coollection\Package\Coollection
      */
     public function buildCountriesCoollection($dataDir)

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

@@ -2,10 +2,10 @@
 
 namespace PragmaRX\Countries\Update;
 
-use PragmaRX\Countries\Package\Support\Base;
+use PragmaRX\Countries\Package\Countries as CountriesService;
 use PragmaRX\Countries\Package\Services\Cache;
 use PragmaRX\Countries\Package\Services\Config;
-use PragmaRX\Countries\Package\Countries as CountriesService;
+use PragmaRX\Countries\Package\Support\Base;
 
 class Countries extends Base
 {

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 
         $dataDir = '/countries/default/';
 
-        $this->updater->setCountries($this->cache->remember('updateCountries->buildCountriesCoollection', 160, function () use ($dataDir) {
+        $this->updater->setCountries($this->cache->remember('updateCountries->buildCountriesCoollection', 160, function() use ($dataDir) {
             $this->helper->eraseDataDir($dataDir);
 
             return $this->buildCountriesCoollection($dataDir);
@@ -104,12 +104,12 @@ 
 
         $this->helper->message('Generating countries...');
 
-        $countries = coollect($shapeFile)->map(function ($country) {
+        $countries = coollect($shapeFile)->map(function($country) {
             return $this->natural->fixNaturalOddCountries($country);
-        })->mapWithKeys(function ($natural) use ($mledoze, $dataDir) {
+        })->mapWithKeys(function($natural) use ($mledoze, $dataDir) {
             list($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/update/Mledoze.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 Mledoze extends Base
 {

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 @@ 
     {
         list($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/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
 {

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) {
+            $currencies = countriesCollect($country['currencies'])->mapWithKeys(function($code) {
                 if ($this->isCurrenciesArray($code)) {
                     return [
                         $code['ISO4217Code'] => $code,
@@ -411,7 +411,7 @@ 
      */
     public function addCountry($countryCode, $country)
     {
-        if (! isset($this->repository->countries[$countryCode])) {
+        if (!isset($this->repository->countries[$countryCode])) {
             $this->repository->countries[$countryCode] = $country;
         }
     }
@@ -438,14 +438,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;
         });
 

Doc Comments +6 added lines, -6 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)
     {
@@ -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)
     {

src/update/Helper.php

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

@@ -3,12 +3,12 @@
 namespace PragmaRX\Countries\Update;
 
 use Exception;
-use ReflectionClass;
-use ShapeFile\ShapeFile;
-use RecursiveIteratorIterator;
-use RecursiveDirectoryIterator;
 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
 {

Doc Comments +18 added lines, -13 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,8 +315,8 @@ 
     /**
      * Load a shapeFile.
      *
-     * @param $dir
-     * @return \PragmaRX\Coollection\Package\Coollection
+     * @param string $dir
+     * @return string
      */
     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)

Spacing +19 added lines, -19 removed lines

@@ -158,7 +158,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}");
@@ -215,7 +215,7 @@ 
 
         $fw = $this->fopenOrFail($destination, 'w');
 
-        while (! feof($fr)) {
+        while (!feof($fr)) {
             fwrite($fw, fread($fr, 4096));
             flush();
         }
@@ -236,7 +236,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;
@@ -261,7 +261,7 @@ 
     protected function renameMasterToPackage($file, $subPath, $path, $exclude)
     {
         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();
 
@@ -277,7 +277,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;
         }
 
@@ -296,7 +296,7 @@ 
      */
     public function delTree($dir)
     {
-        if (! file_exists($dir)) {
+        if (!file_exists($dir)) {
             return false;
         }
 
@@ -333,9 +333,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];
                 }),
             ];
@@ -354,7 +354,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;
@@ -382,7 +382,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);
     }
@@ -418,9 +418,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);
@@ -488,7 +488,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)];
@@ -521,7 +521,7 @@ 
      */
     public function moveDataFiles()
     {
-        $this->config->get('moveable')->each(function ($to, $from) {
+        $this->config->get('moveable')->each(function($to, $from) {
             $this->moveDataFile($from, $to);
         });
     }
@@ -550,7 +550,7 @@ 
      */
     public function message($message, $type = 'line')
     {
-        if (! is_null($this->command)) {
+        if (!is_null($this->command)) {
             $this->command->{$type}($message);
         }
     }
@@ -580,7 +580,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)));
         }
 
@@ -596,7 +596,7 @@ 
      */
     public function makeJsonFileName($key, $dir = '')
     {
-        if (! ends_with($dir, (DIRECTORY_SEPARATOR))) {
+        if (!ends_with($dir, (DIRECTORY_SEPARATOR))) {
             $dir .= DIRECTORY_SEPARATOR;
         }
 
@@ -677,7 +677,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/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
 {

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 @@ 
     {
         list($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;
         });
     }