Fix OpenCage, IpInfoDb and BingMaps tests

Author: willdurand

phpunit.xml.dist

@@ -20,12 +20,10 @@
         <!-- API Keys -->
         <!-- <server name="IPINFODB_API_KEY" value="YOUR_API_KEY" /> -->
         <!-- <server name="BINGMAPS_API_KEY" value="YOUR_API_KEY" /> -->
-        <!-- <server name="IGN_WEB_API_KEY" value="YOUR_API_KEY" /> -->
         <!-- <server name="GEOIPS_API_KEY" value="YOUR_API_KEY" /> -->
         <!-- <server name="MAXMIND_API_KEY" value="YOUR_API_KEY" /> -->
         <!-- <server name="MAPQUEST_API_KEY" value="YOUR_API_KEY" /> -->
         <!-- <server name="GEONAMES_USERNAME" value="YOUR_USERNAME" /> -->
-        <!-- <server name="BAIDU_API_KEY" value="YOUR_API_KEY" /> -->
         <!-- <server name="TOMTOM_GEOCODING_KEY" value="YOUR_GEOCODING_KEY" /> -->
         <!-- <server name="TOMTOM_MAP_KEY" value="YOUR_MAP_KEY" /> -->
         <!-- <server name="GOOGLE_GEOCODING_KEY" value="YOUR_GEOCODING_KEY" /> -->

src/Geocoder/Provider/IpInfoDb.php

@@ -56,7 +56,7 @@ public function geocode($address)
 
         // This API does not support IPv6
         if (filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            throw new UnsupportedOperation('The IpInfoDb provider does not support IPv6 addresses.');
+            throw new UnsupportedOperation('The IpInfoDb provider does not support IPv6 addresses, only IPv4 addresses.');
         }
 
         if ('127.0.0.1' === $address) {

src/Geocoder/Provider/OpenCage.php

@@ -153,7 +153,7 @@ private function executeQuery($query)
             $results[] = array_merge($this->getDefaults(), array(
                 'latitude'     => $location['geometry']['lat'],
                 'longitude'    => $location['geometry']['lng'],
-                'bounds'       => $bounds ?: null,
+                'bounds'       => $bounds ?: [],
                 'streetNumber' => isset($comp['house_number']) ? $comp['house_number'] : null,
                 'streetName'   => isset($comp['road']        ) ? $comp['road']         : null,
                 'subLocality'  => isset($comp['suburb']      ) ? $comp['suburb']       : null,

tests/Geocoder/Tests/CachedResponseAdapter.php

@@ -41,22 +41,18 @@ protected function doSend(InternalRequestInterface $internalRequest)
 
         if ($this->useCache && is_file($file) && is_readable($file)) {
             $content = unserialize(file_get_contents($file));
-            $body = new StringStream($content);
+            $body    = new StringStream($content);
 
             $response = $this->adapter->getConfiguration()->getMessageFactory()->createResponse(
-                200,
-                'OK',
-                '1.1',
-                [],
-                $body
+                200, 'OK', '1.1', [], $body
             );
 
             if (!empty($content)) {
                 return $response;
             }
         }
 
-        $response = $this->adapter->get($internalRequest);
+        $response = $this->adapter->get($internalRequest->getUrl());
 
         if ($this->useCache) {
             file_put_contents($file, serialize((string) $response->getBody()));

tests/Geocoder/Tests/Provider/BingMapsTest.php

@@ -301,7 +301,7 @@ public function testReverseWithRealCoordinatesReturnsSingleResult()
         $this->assertNull($result->getStreetNumber());
         $this->assertEquals('10 Avenue Gambetta', $result->getStreetName());
         $this->assertEquals(75020, $result->getPostalCode());
-        $this->assertEquals('20e Arrondissement', $result->getLocality());
+        $this->assertEquals('Paris', $result->getLocality());
         $this->assertEquals('Paris', $result->getCounty()->getName());
         $this->assertEquals('IdF', $result->getRegion()->getName());
         $this->assertEquals('France', $result->getCountry()->getName());

tests/Geocoder/Tests/Provider/IpInfoDbTest.php

@@ -86,7 +86,7 @@ public function testGeocodeWithLocalhostIPv4()
 
     /**
      * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The IpInfoDb provider does not support IPv6 addresses.
+     * @expectedExceptionMessage The IpInfoDb provider does not support IPv6 addresses, only IPv4 addresses.
      */
     public function testGeocodeWithLocalhostIPv6()
     {
@@ -136,7 +136,7 @@ public function testGeocodeWithRealIPv4()
         $this->assertEquals('CALIFORNIA', $result->getRegion()->getName());
         $this->assertEquals('UNITED STATES', $result->getCountry()->getName());
         $this->assertEquals('US', $result->getCountry()->getCode());
-        $this->assertEquals('America/Denver', $result->getTimezone());
+        $this->assertEquals('America/Los_Angeles', $result->getTimezone());
     }
 
     /**

tests/Geocoder/Tests/TestCase.php

@@ -4,7 +4,7 @@
 
 use Geocoder\Model\AddressFactory;
 use Ivory\HttpAdapter\HttpAdapterInterface;
-use Ivory\HttpAdapter\SocketHttpAdapter;
+use Ivory\HttpAdapter\CurlHttpAdapter;
 
 /**
  * @author William Durand <[email protected]>
@@ -73,7 +73,7 @@ protected function getMockAdapterReturns($returnValue)
      */
     protected function getAdapter()
     {
-        return new CachedResponseAdapter(new SocketHttpAdapter(), $this->useCache());
+        return new CachedResponseAdapter(new CurlHttpAdapter(), $this->useCache());
     }
 
     /**