Integrate Guzzle 6.0

FriendsOfPHP · Jun 21, 2015 · d12732a · d12732a
1 parent 3578769
commit d12732a
Show file tree

Hide file tree

Showing 6 changed files with 149 additions and 143 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ php:
     - 7.0
     - 5.6
     - 5.5
-    - 5.4
     - hhvm
 
 install:

diff --git a/Goutte/Client.php b/Goutte/Client.php
@@ -13,10 +13,9 @@
 
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\ClientInterface as GuzzleClientInterface;
+use GuzzleHttp\Cookie\CookieJar;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\Response as GuzzleResponse;
-use GuzzleHttp\Post\PostFile;
+use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\BrowserKit\Client as BaseClient;
 use Symfony\Component\BrowserKit\Response;
 
@@ -25,6 +24,7 @@
  *
  * @author Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author Michael Dowling <michael@guzzlephp.org>
+ * @author Charles Sarrazin <charles@sarraz.in>
  */
 class Client extends BaseClient
 {
@@ -90,44 +90,44 @@ protected function doRequest($request)
             }
         }
 
-        $body = null;
+        $cookies = CookieJar::fromArray(
+            $this->getCookieJar()->allRawValues($request->getUri()),
+            $request->getServer()['HTTP_HOST']
+        );
+
+        $requestOptions = array(
+            'cookies' => $cookies,
+            'allow_redirects' => false,
+            'auth' => $this->auth,
+        );
+
         if (!in_array($request->getMethod(), array('GET', 'HEAD'))) {
             if (null !== $request->getContent()) {
-                $body = $request->getContent();
+                $requestOptions['body'] = $request->getContent();
             } else {
-                $body = $request->getParameters();
+                $requestOptions['form_params'] = $request->getParameters();
+
+                if ($files = $request->getFiles()) {
+                    $requestOptions['multipart'] = [];
+                    $this->addPostFiles($files, $requestOptions['multipart']);
+                }
             }
         }
 
-        $this->getClient()->setDefaultOption('auth', $this->auth);
-
-        $requestOptions = array(
-            'body' => $body,
-            'cookies' => $this->getCookieJar()->allRawValues($request->getUri()),
-            'allow_redirects' => false,
-        );
-
         if (!empty($headers)) {
             $requestOptions['headers'] = $headers;
         }
 
-        $guzzleRequest = $this->getClient()->createRequest(
-            $request->getMethod(),
-            $request->getUri(),
-            $requestOptions
-        );
+        $method = $request->getMethod();
+        $uri = $request->getUri();
 
         foreach ($this->headers as $name => $value) {
-            $guzzleRequest->setHeader($name, $value);
-        }
-
-        if ('POST' == $request->getMethod() || 'PUT' == $request->getMethod() && $request->getFiles()) {
-            $this->addPostFiles($guzzleRequest, $request->getFiles());
+            $requestOptions['headers'][$name] = $value;
         }
 
         // Let BrowserKit handle redirects
         try {
-            $response = $this->getClient()->send($guzzleRequest);
+            $response = $this->getClient()->request($method, $uri, $requestOptions);
         } catch (RequestException $e) {
             $response = $e->getResponse();
             if (null === $response) {
@@ -138,33 +138,45 @@ protected function doRequest($request)
         return $this->createResponse($response);
     }
 
-    protected function addPostFiles(RequestInterface $request, array $files, $arrayName = '')
+    protected function addPostFiles(array $files, array &$multipart, $arrayName = '')
     {
+        if (empty($files)) {
+            return;
+        }
+
         foreach ($files as $name => $info) {
             if (!empty($arrayName)) {
                 $name = $arrayName.'['.$name.']';
             }
 
+            $file = [
+                'name' => $name,
+            ];
+
             if (is_array($info)) {
                 if (isset($info['tmp_name'])) {
                     if ('' !== $info['tmp_name']) {
-                        $request->getBody()->addFile(new PostFile($name, fopen($info['tmp_name'], 'r'), isset($info['name']) ? $info['name'] : null));
+                        $file['contents'] = fopen($info['tmp_name'], 'r');
+                        if (isset($info['name'])) {
+                            $file['filename'] = $info['name'];
+                        }
                     } else {
                         continue;
                     }
                 } else {
-                    $this->addPostFiles($request, $info, $name);
+                    $this->addPostFiles($info, $multipart, $name);
+                    continue;
                 }
             } else {
-                $request->getBody()->addFile(new PostFile($name, fopen($info, 'r')));
+                $file['contents'] = fopen($info, 'r');
             }
+
+            $multipart[] = $file;
         }
     }
 
-    protected function createResponse(GuzzleResponse $response)
+    protected function createResponse(ResponseInterface $response)
     {
-        $headers = $response->getHeaders();
-
-        return new Response($response->getBody(true), $response->getStatusCode(), $headers);
+        return new Response((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders());
     }
 }