Merge branch '1.7'

Author: willdurand

src/Geocoder/Provider/AbstractProvider.php

@@ -151,4 +151,16 @@ protected function getLocalhostDefaults()
             'country'   => 'localhost',
         );
     }
+
+    /**
+     * @param array $results
+     *
+     * @return array
+     */
+    protected function fixEncoding(array $results)
+    {
+        return array_map(function($value) {
+            return is_string($value) ? utf8_encode($value) : $value;
+        }, $results);
+    }
 }

src/Geocoder/Provider/GeoipProvider.php

@@ -58,7 +58,7 @@ public function getGeocodedData($address)
         $timezone = @geoip_time_zone_by_country_and_region($results['country_code'], $results['region']) ?: null;
         $region = @geoip_region_name_by_code($results['country_code'], $results['region']) ?: $results['region'];
 
-        $results = array_merge($this->getDefaults(), array(
+        return $this->fixEncoding(array_merge($this->getDefaults(), array(
             'latitude'    => $results['latitude'],
             'longitude'   => $results['longitude'],
             'city'        => $results['city'],
@@ -68,11 +68,7 @@ public function getGeocodedData($address)
             'country'     => $results['country_name'],
             'countryCode' => $results['country_code'],
             'timezone'    => $timezone,
-        ));
-
-        return array(array_map(function($value) {
-            return is_string($value) ? utf8_encode($value) : $value;
-        }, $results));
+        )));
     }
 
     /**

src/Geocoder/Provider/MaxMindBinaryProvider.php

@@ -75,7 +75,7 @@ public function getGeocodedData($address)
             throw new NoResultException(sprintf('No results found for IP address %s', $address));
         }
 
-        return array(array_merge($this->getDefaults(), array(
+        return $this->fixEncoding(array_merge($this->getDefaults(), array(
             'countryCode' => $geoIpRecord->country_code,
             'country'     => $geoIpRecord->country_name,
             'region'      => $geoIpRecord->region,

tests/Geocoder/Tests/Provider/MaxMindBinaryProviderTest.php

@@ -92,6 +92,14 @@ public function testFindLocationByIp($ip, $expectedCity, $expectedCountry)
         $this->assertEquals($expectedCountry, $result['country']);
     }
 
+    public function testShouldReturnResultsAsUtf8Encoded()
+    {
+        $provider = new MaxMindBinaryProvider($this->binaryFile);
+        $result   = $provider->getGeocodedData('212.51.181.237');
+
+        $this->assertSame('Châlette-sur-loing', $result['city']);
+    }
+
     public function testGetName()
     {
         $provider = new MaxMindBinaryProvider($this->binaryFile);