Update to Guzzle 6

jenssegers · jenssegers · commit f6dceac7ca4d · 2015-05-29T20:01:19.000+02:00
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "symfony/http-foundation": "~2.6",
-        "guzzlehttp/guzzle": "~4.0|~5.0"
+        "guzzlehttp/guzzle": "~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.4",
diff --git a/src/Adapter/Guzzle/GuzzleAdapter.php b/src/Adapter/Guzzle/GuzzleAdapter.php
@@ -1,11 +1,11 @@
 <?php namespace Proxy\Adapter\Guzzle;
 
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\MessageFactoryInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Proxy\Adapter\AdapterInterface;
+use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Uri;
+use GuzzleHttp\Psr7\Request as GuzzleRequest;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -18,24 +18,14 @@ class GuzzleAdapter implements AdapterInterface {
      */
     protected $client;
 
-    /**
-     * The Guzzle message factory instance.
-     *
-     * @var MessageFactory
-     */
-    protected $messageFactory;
-
     /**
      * Construct a Guzzle based HTTP adapter.
      *
      * @param Client $client
-     * @param \GuzzleHttp\Message\MessageFactoryInterface $messageFactory
      */
-    public function __construct(Client $client = null, MessageFactoryInterface $messageFactory = null)
+    public function __construct(Client $client = null)
     {
         $this->client = $client ?: new Client;
-
-        $this->messageFactory = $messageFactory ?: new MessageFactory;
     }
 
     /**
@@ -47,9 +37,7 @@ public function __construct(Client $client = null, MessageFactoryInterface $mess
      */
     public function send(Request $request, $url)
     {
-        $guzzleRequest = $this->convertRequest($request);
-
-        $guzzleRequest->setUrl($url);
+        $guzzleRequest = $this->convertRequest($request)->withUri(new Uri($url));
 
         $guzzleResponse = $this->client->send($guzzleRequest);
 
@@ -64,7 +52,12 @@ public function send(Request $request, $url)
      */
     protected function convertRequest(Request $request)
     {
-        return $this->messageFactory->fromMessage((string) $request);
+        return new GuzzleRequest(
+            $request->getMethod(),
+            $request->getRequestUri(),
+            $request->headers->all(),
+            $request->getContent()
+        );
     }
 
     /**
diff --git a/tests/Proxy/Adapter/Dummy/DummyAdapterTest.php b/tests/Proxy/Adapter/Dummy/DummyAdapterTest.php
@@ -30,7 +30,7 @@ public function adapter_returns_symfony_response()
      */
     public function response_contains_target_url_as_xheader()
     {
-        $url = 'http://www.rebuy.de';
+        $url = 'http://www.example.com';
 
         $response = $this->adapter->send(Request::createFromGlobals(), $url);
 
diff --git a/tests/Proxy/Adapter/Guzzle/GuzzleAdapterTest.php b/tests/Proxy/Adapter/Guzzle/GuzzleAdapterTest.php
@@ -2,9 +2,8 @@
 namespace Proxy\Proxy\Adapter\Guzzle;
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Ring\Client\MockHandler;
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Handler\MockHandler;
 use Proxy\Adapter\Guzzle\GuzzleAdapter;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -32,12 +31,8 @@ class GuzzleAdapterTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $response = $this->createResponse();
-
         $mock = new MockHandler([
-            'status'  => $response->getStatusCode(),
-            'headers' => $response->getHeaders(),
-            'body'    => $response->getBody(),
+            $this->createResponse(),
         ]);
 
         $client = new Client(['handler' => $mock]);
@@ -94,8 +89,8 @@ public function adapter_sends_request()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $verifyParam = $this->callback(function (\GuzzleHttp\Message\Request $request) {
-            return $request->getUrl() == 'http://www.example.com';
+        $verifyParam = $this->callback(function (\GuzzleHttp\Psr7\Request $request) {
+            return $request->getUri() == 'http://www.example.com';
         });
 
         $clientMock->expects($this->once())
@@ -123,9 +118,7 @@ private function sendRequest()
      */
     private function createResponse()
     {
-        $body = Stream::factory($this->body);
-
-        return new Response($this->status, $this->headers, $body);
+        return new Response($this->status, $this->headers, $this->body);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function adapter_returns_symfony_response()`
`30`	`30`	`*/`
`31`	`31`	`public function response_contains_target_url_as_xheader()`
`32`	`32`	`{`
`33`		`- $url = 'http://www.rebuy.de';`
	`33`	`+ $url = 'http://www.example.com';`
`34`	`34`
`35`	`35`	`$response = $this->adapter->send(Request::createFromGlobals(), $url);`
`36`	`36`