diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 0dc8387..ebd5b0f 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,6 +1,9 @@ - + + + + @@ -8,13 +11,10 @@ cache->flush()]]> - supportsTags()) ? $cache : $cache->tags($tags)]]> + tags($tags) : $cache]]> - - - output->error('Default cache system does not support tags')]]> @@ -26,21 +26,17 @@ - - - - + + + - - - @@ -55,9 +51,6 @@ - - - @@ -65,28 +58,13 @@ - - - - - - - - - - - - - - remote_ip]]> - remote_ip]]> - currencies === null]]> service === null]]> + default_location['ip'] = $this->getClientIP()]]> config('cache_tags'), @@ -108,18 +86,18 @@ config('cache_tags')]]> config('default_location', [])]]> - - default_location]]> - + + + config('service')]]> @@ -130,6 +108,11 @@ + + + + + iso_code]]> @@ -137,6 +120,7 @@ + @@ -144,11 +128,14 @@ - - currency]]> - - - + + + + + + + + @@ -167,11 +154,11 @@ config]]> + + + - - - @@ -202,31 +189,30 @@ config('continent_path')]]> config('continent_path')]]> - - $ip, - 'iso_code' => $json->countryCode, - 'country' => $json->country, - 'city' => $json->city, - 'state' => $json->region, - 'state_name' => $json->regionName, - 'postal_code' => $json->zip, - 'lat' => $json->lat, - 'lon' => $json->lon, - 'timezone' => $json->timezone, - 'continent' => $this->getContinent($json->countryCode), - ]]]> - + continents]]> + + message]]> + + city]]> + country]]> + countryCode]]> + lat]]> + lon]]> message]]> + region]]> + regionName]]> + status]]> + timezone]]> + zip]]> continents, $code, 'Unknown')]]> @@ -249,22 +235,6 @@ - - $ip, - 'iso_code' => $json['country_code'], - 'country' => $json['country_name'], - 'city' => $json['city'], - 'state' => $json['region_code'], - 'state_name' => $json['region'], - 'postal_code' => $json['postal'], - 'lat' => $json['latitude'], - 'lon' => $json['longitude'], - 'timezone' => Arr::get($json, 'time_zone.name'), - 'continent' => Arr::get($json, 'continent_code'), - 'currency' => Arr::get($json, 'currency.code'), - ]]]> - @@ -310,11 +280,34 @@ + + + + + + + + + + + + config('database_path')]]> config('locales', ['en'])]]> config('update_url')]]> + + + + + + + + + + + @@ -327,7 +320,12 @@ errors)]]> + + + + + config, 'headers', [])]]> config, 'query', [])]]> @@ -344,24 +342,17 @@ - - - - + - getLocation($ip)]]> - - - diff --git a/src/Services/MaxMindDatabase.php b/src/Services/MaxMindDatabase.php index 0f05c1d..40f65c0 100644 --- a/src/Services/MaxMindDatabase.php +++ b/src/Services/MaxMindDatabase.php @@ -77,7 +77,7 @@ public function update() $this->withTemporaryDirectory(function ($directory): void { $tarFile = sprintf('%s/maxmind.tar.gz', $directory); - file_put_contents($tarFile, fopen($this->config('update_url'), 'rb')); + $this->downloadFileByUrl($tarFile, $this->config('update_url')); $archive = new \PharData($tarFile); @@ -173,4 +173,26 @@ protected function deleteDirectory(string $directory) return rmdir($directory); } + + protected function downloadFileByUrl(string $filename, string $url): void + { + $canUseFopenForUrl = in_array(strtolower((string) ini_get('allow_url_fopen')), ['1', 'on'], true); + if ($canUseFopenForUrl) { + file_put_contents($filename, fopen($url, 'rb')); + } elseif (extension_loaded('curl')) { + $fp = fopen($filename, 'wb+'); + if ($fp === false) { + throw new \RuntimeException("Cannot open {$filename} file for writing."); + } + $ch = curl_init(); + curl_setopt($ch, \CURLOPT_URL, $url); + curl_setopt($ch, \CURLOPT_FILE, $fp); + curl_setopt($ch, \CURLOPT_FOLLOWLOCATION, true); + curl_exec($ch); + curl_close($ch); + fclose($fp); + } else { + throw new \RuntimeException('Cannot download the file. Please enable allow_url_fopen or install curl extension.'); + } + } }