Utf8 encode (#1225)

* provider: IP2LocationBinary: replace utf8_encode with mb_convert_encoding * provider: MaxMindBinary: replace utf8_encode with mb_convert_encoding
geocoder-php · May 18, 2024 · 906c7e3 · 906c7e3
1 parent 68da202
commit 906c7e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MaxMindBinary.php b/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/composer.json b/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"
     }
-}
+}