diff --git a/src/Provider/MaxMindBinary/MaxMindBinary.php b/src/Provider/MaxMindBinary/MaxMindBinary.php index 560ec7467..3e1f8a856 100644 --- a/src/Provider/MaxMindBinary/MaxMindBinary.php +++ b/src/Provider/MaxMindBinary/MaxMindBinary.php @@ -92,9 +92,9 @@ public function geocodeQuery(GeocodeQuery $query): Collection Address::createFromArray([ 'providedBy' => $this->getName(), 'countryCode' => $geoIpRecord->country_code, - 'country' => null === $geoIpRecord->country_name ? null : utf8_encode($geoIpRecord->country_name), + 'country' => null === $geoIpRecord->country_name ? null : mb_convert_encoding($geoIpRecord->country_name, 'UTF-8', 'ISO-8859-1'), 'adminLevels' => $adminLevels, - 'locality' => null === $geoIpRecord->city ? null : utf8_encode($geoIpRecord->city), + 'locality' => null === $geoIpRecord->city ? null : mb_convert_encoding($geoIpRecord->city, 'UTF-8', 'ISO-8859-1'), 'latitude' => $geoIpRecord->latitude, 'longitude' => $geoIpRecord->longitude, 'postalCode' => $geoIpRecord->postal_code, diff --git a/src/Provider/MaxMindBinary/composer.json b/src/Provider/MaxMindBinary/composer.json index bf2b69d90..e22175867 100644 --- a/src/Provider/MaxMindBinary/composer.json +++ b/src/Provider/MaxMindBinary/composer.json @@ -14,6 +14,7 @@ "require": { "php": "^8.0", "geoip/geoip": "^1.17", + "symfony/polyfill-mbstring": "^1.0", "willdurand/geocoder": "^4.0" }, "provide": { @@ -42,4 +43,4 @@ "test": "vendor/bin/phpunit", "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" } -} \ No newline at end of file +}