Merge branch 'geocoder-php:master' into master

Author: Chris53897

.github/workflows/subtree.yml

@@ -82,7 +82,7 @@ jobs:
           - { folder: Here, repository: here-provider }
           - { folder: HostIp, repository: host-ip-provider }
           - { folder: IP2Location, repository: ip2location-provider }
-          # - { folder: IP2LocationBinary, repository: ip2location-binary-provider }
+          - { folder: IP2LocationBinary, repository: ip2location-binary-provider }
           - { folder: IpInfo, repository: ip-info-provider }
           - { folder: IpInfoDb, repository: ip-info-db-provider }
           - { folder: Ipstack, repository: ipstack-provider }

src/Provider/BingMaps/BingMaps.php

@@ -82,7 +82,7 @@ public function getName(): string
         return 'bing_maps';
     }
 
-    private function executeQuery(string $url, ?string $locale = null, int $limit): Collection
+    private function executeQuery(string $url, ?string $locale = null, int $limit = 1): Collection
     {
         if (null !== $locale) {
             $url = sprintf('%s&culture=%s', $url, str_replace('_', '-', $locale));

src/Provider/GeoIP2/Tests/GeoIP2AdapterTest.php

@@ -150,14 +150,14 @@ protected function getGeoIP2ModelMock($geoIP2Model)
                     'city' => [
                         'geoname_id' => 2911298,
                         'names' => [
-                              'de' => 'Hamburg',
-                              'en' => 'Hamburg',
-                              'es' => 'Hamburgo',
-                              'fr' => 'Hambourg',
-                              'ja' => 'ハンブルク',
-                              'pt-BR' => 'Hamburgo',
-                              'ru' => 'Гамбург',
-                              'zh-CN' => '汉堡市',
+                            'de' => 'Hamburg',
+                            'en' => 'Hamburg',
+                            'es' => 'Hamburgo',
+                            'fr' => 'Hambourg',
+                            'ja' => 'ハンブルク',
+                            'pt-BR' => 'Hamburgo',
+                            'ru' => 'Гамбург',
+                            'zh-CN' => '汉堡市',
                         ],
                     ],
                 ]

src/Provider/GoogleMaps/GoogleMaps.php

@@ -197,7 +197,7 @@ private function buildQuery(string $url, ?string $locale = null, ?string $region
      * @throws InvalidServerResponse
      * @throws InvalidCredentials
      */
-    private function fetchUrl(string $url, ?string $locale = null, int $limit, ?string $region = null): AddressCollection
+    private function fetchUrl(string $url, ?string $locale = null, int $limit = 1, ?string $region = null): AddressCollection
     {
         $url = $this->buildQuery($url, $locale, $region);
         $content = $this->getUrlContents($url);

src/Provider/IP2LocationBinary/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+## 1.3.1
+
+### Changed
+
+- Fix `utf8_encode()` deprecation[^1]
+
 ## 1.3.0
 
 ### Added
@@ -40,3 +46,5 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 ## 1.0.0
 
 First release of this library.
+
+[^1]: See https://www.php.net/manual/en/function.utf8-encode.php

src/Provider/IP2LocationBinary/IP2LocationBinary.php

@@ -81,9 +81,9 @@ public function geocodeQuery(GeocodeQuery $query): Collection
             Address::createFromArray([
                 'providedBy' => $this->getName(),
                 'countryCode' => $records['countryCode'],
-                'country' => null === $records['countryName'] ? null : utf8_encode($records['countryName']),
+                'country' => null === $records['countryName'] ? null : mb_convert_encoding($records['countryName'], 'UTF-8', 'ISO-8859-1'),
                 'adminLevels' => $adminLevels,
-                'locality' => null === $records['cityName'] ? null : utf8_encode($records['cityName']),
+                'locality' => null === $records['cityName'] ? null : mb_convert_encoding($records['cityName'], 'UTF-8', 'ISO-8859-1'),
                 'latitude' => $records['latitude'],
                 'longitude' => $records['longitude'],
                 'postalCode' => $records['zipCode'],

src/Provider/IP2LocationBinary/composer.json

@@ -14,6 +14,7 @@
     "require": {
         "php": "^8.0",
         "ip2location/ip2location-php": "^8.1.1",
+        "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"
     }
-}
+}

src/Provider/MaxMindBinary/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
+## 4.3.1
+
+### Changed
+
+- Fix `utf8_encode()` deprecation[^1]
+
 ## 4.3.0
 
 ### Added
@@ -46,3 +52,5 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 ## 4.0.0
 
 First release of this library.
+
+[^1]: See https://www.php.net/manual/en/function.utf8-encode.php

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,

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"
     }
-}
+}