Merge pull request #420 from egeloen/http-adapter-update

[Http] Update egeloen/http-adapter library

Author: willdurand

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "egeloen/http-adapter": "0.5.*",
+        "egeloen/http-adapter": "0.7.*",
         "igorw/get-in": "~1.0"
     },
     "require-dev": {

tests/.cached_responses/d1c35cb39da7fe59b8d2472945443bd0879b8701

@@ -0,0 +1,65 @@
+s:1907:"{
+   "results" : [
+      {
+         "address_components" : [
+            {
+               "long_name" : "10",
+               "short_name" : "10",
+               "types" : [ "street_number" ]
+            },
+            {
+               "long_name" : "Avenue Gambetta",
+               "short_name" : "Avenue Gambetta",
+               "types" : [ "route" ]
+            },
+            {
+               "long_name" : "Paris",
+               "short_name" : "Paris",
+               "types" : [ "locality", "political" ]
+            },
+            {
+               "long_name" : "Paris",
+               "short_name" : "75",
+               "types" : [ "administrative_area_level_2", "political" ]
+            },
+            {
+               "long_name" : "Île-de-France",
+               "short_name" : "IDF",
+               "types" : [ "administrative_area_level_1", "political" ]
+            },
+            {
+               "long_name" : "France",
+               "short_name" : "FR",
+               "types" : [ "country", "political" ]
+            },
+            {
+               "long_name" : "75020",
+               "short_name" : "75020",
+               "types" : [ "postal_code" ]
+            }
+         ],
+         "formatted_address" : "10 Avenue Gambetta, 75020 Paris, France",
+         "geometry" : {
+            "location" : {
+               "lat" : 48.8631013,
+               "lng" : 2.3888086
+            },
+            "location_type" : "ROOFTOP",
+            "viewport" : {
+               "northeast" : {
+                  "lat" : 48.8644502802915,
+                  "lng" : 2.390157580291502
+               },
+               "southwest" : {
+                  "lat" : 48.8617523197085,
+                  "lng" : 2.387459619708498
+               }
+            }
+         },
+         "place_id" : "ChIJ4b303vJt5kcRF9AQdh4ZjWc",
+         "types" : [ "street_address" ]
+      }
+   ],
+   "status" : "OK"
+}
+";

tests/Geocoder/Tests/CachedResponseAdapter.php

@@ -5,7 +5,6 @@
 use Ivory\HttpAdapter\AbstractHttpAdapter;
 use Ivory\HttpAdapter\HttpAdapterInterface;
 use Ivory\HttpAdapter\Message\InternalRequestInterface;
-use Ivory\HttpAdapter\Message\Stream\StringStream;
 use Ivory\HttpAdapter\Message\RequestInterface;
 
 class CachedResponseAdapter extends AbstractHttpAdapter
@@ -39,28 +38,27 @@ public function getName()
     /**
      * {@inheritDoc}
      */
-    protected function doSend(InternalRequestInterface $internalRequest)
+    protected function sendInternalRequest(InternalRequestInterface $internalRequest)
     {
-        $url = $internalRequest->getUrl();
+        $url = (string) $internalRequest->getUri();
         if ($this->apiKey) {
             $url = str_replace($this->apiKey, '[apikey]', $url);
         }
+
         $file = sprintf('%s/%s/%s', realpath(__DIR__ . '/../../'), $this->cacheDir, sha1($url));
 
         if ($this->useCache && is_file($file) && is_readable($file)) {
             $content = unserialize(file_get_contents($file));
-            $body    = new StringStream($content);
-
-            $response = $this->adapter->getConfiguration()->getMessageFactory()->createResponse(
-                200, 'OK', RequestInterface::PROTOCOL_VERSION_1_1, [], $body
-            );
 
             if (!empty($content)) {
-                return $response;
+                return $this->adapter
+                    ->getConfiguration()
+                    ->getMessageFactory()
+                    ->createResponse(200, RequestInterface::PROTOCOL_VERSION_1_1, [], $content);
             }
         }
 
-        $response = $this->adapter->get($internalRequest->getUrl());
+        $response = $this->adapter->get($url);
 
         if ($this->useCache) {
             file_put_contents($file, serialize((string) $response->getBody()));

tests/Geocoder/Tests/Provider/AbstractProviderTest.php

@@ -40,7 +40,7 @@ public function getName()
         return 'mock_http_adapter';
     }
 
-    protected function doSend(InternalRequestInterface $internalRequest)
+    protected function sendInternalRequest(InternalRequestInterface $internalRequest)
     {
     }
 }