Fix GeoipProvider and MaxMindBinaryProvider

Bad return in getGeocodedData()

Author: willdurand

src/Geocoder/Provider/GeoipProvider.php

@@ -56,9 +56,9 @@ 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'];
+        $region   = @geoip_region_name_by_code($results['country_code'], $results['region']) ?: $results['region'];
 
-        return $this->fixEncoding(array_merge($this->getDefaults(), array(
+        return array($this->fixEncoding(array_merge($this->getDefaults(), array(
             'latitude'    => $results['latitude'],
             'longitude'   => $results['longitude'],
             'city'        => $results['city'],
@@ -68,7 +68,7 @@ public function getGeocodedData($address)
             'country'     => $results['country_name'],
             'countryCode' => $results['country_code'],
             'timezone'    => $timezone,
-        )));
+        ))));
     }
 
     /**

src/Geocoder/Provider/MaxMindBinaryProvider.php

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

tests/Geocoder/Tests/Provider/GeoipProviderTest.php

@@ -55,12 +55,12 @@ public function testGetGeocodedDataWithAddress()
     public function testGetGeocodedDataWithLocalhostIPv4()
     {
         $provider = new GeoipProvider();
-        $result   = $provider->getGeocodedData('127.0.0.1');
+        $results  = $provider->getGeocodedData('127.0.0.1');
 
-        $this->assertInternalType('array', $result);
-        $this->assertCount(1, $result);
+        $this->assertInternalType('array', $results);
+        $this->assertCount(1, $results);
 
-        $result = $result[0];
+        $result = $results[0];
         $this->assertInternalType('array', $result);
         $this->assertArrayNotHasKey('latitude', $result);
         $this->assertArrayNotHasKey('longitude', $result);
@@ -86,12 +86,12 @@ public function testGetGeocodedDataWithLocalhostIPv6()
     public function testGetGeocodedDataWithRealIPv4()
     {
         $provider = new GeoipProvider();
-        $result   = $provider->getGeocodedData('74.200.247.59');
+        $results  = $provider->getGeocodedData('74.200.247.59');
 
-        $this->assertInternalType('array', $result);
-        $this->assertCount(1, $result);
+        $this->assertInternalType('array', $results);
+        $this->assertCount(1, $results);
 
-        $result = $result[0];
+        $result = $results[0];
         $this->assertInternalType('array', $result);
         $this->assertNotNull($result['latitude']);
         $this->assertNotNull($result['longitude']);

tests/Geocoder/Tests/Provider/MaxMindBinaryProviderTest.php

@@ -47,12 +47,12 @@ public function testThrowIfNotExistBinaryFileGiven()
     public function testLocationResultContainsExpectedFields($ip)
     {
         $provider = new MaxMindBinaryProvider($this->binaryFile);
-        $result   = $provider->getGeocodedData($ip);
+        $results  = $provider->getGeocodedData($ip);
 
-        $this->assertInternalType('array', $result);
-        $this->assertCount(1, $result);
+        $this->assertInternalType('array', $results);
+        $this->assertCount(1, $results);
 
-        $result = $result[0];
+        $result = $results[0];
         $this->assertInternalType('array', $result);
 
         $this->assertArrayHasKey('country', $result);
@@ -95,9 +95,9 @@ public function testFindLocationByIp($ip, $expectedCity, $expectedCountry)
     public function testShouldReturnResultsAsUtf8Encoded()
     {
         $provider = new MaxMindBinaryProvider($this->binaryFile);
-        $result   = $provider->getGeocodedData('212.51.181.237');
+        $results  = $provider->getGeocodedData('212.51.181.237');
 
-        $this->assertSame('Châlette-sur-loing', $result['city']);
+        $this->assertSame('Châlette-sur-loing', $results[0]['city']);
     }
 
     public function testGetName()