Make zend http adapter work with socket and curl adapter

Author: joelwurtz

src/Client.php

@@ -35,6 +35,7 @@ public function __construct(ZendClient $client = null, ResponseFactory $response
      */
     public function sendRequest(RequestInterface $request)
     {
+        $request = $this->sanitizeRequest($request);
         $headers = new Headers();
 
         foreach ($request->getHeaders() as $key => $value) {
@@ -44,10 +45,25 @@ public function sendRequest(RequestInterface $request)
         $zendRequest = new Request();
         $zendRequest->setMethod($request->getMethod());
         $zendRequest->setUri((string) $request->getUri());
-        $zendRequest->setVersion($request->getProtocolVersion());
         $zendRequest->setHeaders($headers);
         $zendRequest->setContent($request->getBody()->getContents());
 
+        $options = [
+            'httpversion' => $request->getProtocolVersion(),
+        ];
+
+        if (extension_loaded('curl')) {
+            $options['curloptions'] = [
+                CURLOPT_HTTP_VERSION => $this->getProtocolVersion($request->getProtocolVersion()),
+            ];
+        }
+
+        $this->client->setOptions($options);
+
+        if ($this->client->getAdapter() instanceof ZendClient\Adapter\Curl && $request->getMethod()) {
+            $request = $request->withHeader('Content-Length', '0');
+        }
+
         try {
             $zendResponse = $this->client->send($zendRequest);
         } catch (RuntimeException $exception) {
@@ -62,4 +78,77 @@ public function sendRequest(RequestInterface $request)
             $zendResponse->getVersion()
         );
     }
+
+    private function sanitizeRequest(RequestInterface $request)
+    {
+        $request = $this->sanitizeWithTrace($request);
+        $request = $this->sanitizeWithCurl($request);
+
+        return $request;
+    }
+
+    /**
+     * Zend request remove the body if it's a trace but does not rewrite the content length header,
+     * This can lead to error from the server has it can expect a specific content length, but don't have
+     * a body, so we set content-length to 0 to avoid bad reading from the server.
+     *
+     * @param RequestInterface $request
+     *
+     * @return RequestInterface|static
+     */
+    private function sanitizeWithTrace(RequestInterface $request)
+    {
+        if ($request->getMethod() === 'TRACE') {
+            $request = $request->withHeader('Content-Length', '0');
+        }
+
+        return $request;
+    }
+
+    /**
+     * Get specific curl options for Zend Curl Adapter
+     *
+     * @param RequestInterface $request
+     *
+     * @return RequestInterface|static
+     */
+    private function sanitizeWithCurl(RequestInterface $request)
+    {
+        if ($this->client->getAdapter() instanceof ZendClient\Adapter\Curl && !in_array($request->getMethod(), [
+                'POST',
+                'PUT',
+                'PATCH'
+            ], true)) {
+
+            $request = $request->withHeader('Content-Length', '0');
+        }
+
+        return $request;
+    }
+
+    /**
+     * Return cURL constant for specified HTTP version
+     *
+     * @param string $requestVersion
+     *
+     * @throws \UnexpectedValueException if unsupported version requested
+     *
+     * @return int
+     */
+    private function getProtocolVersion($requestVersion)
+    {
+        switch ($requestVersion) {
+            case '1.0':
+                return CURL_HTTP_VERSION_1_0;
+            case '1.1':
+                return CURL_HTTP_VERSION_1_1;
+            case '2.0':
+                if (defined('CURL_HTTP_VERSION_2_0')) {
+                    return CURL_HTTP_VERSION_2_0;
+                }
+                throw new \UnexpectedValueException('libcurl 7.33 needed for HTTP 2.0 support');
+        }
+
+        return CURL_HTTP_VERSION_NONE;
+    }
 }

tests/ClientTest.php

@@ -4,11 +4,27 @@
 
 use Http\Adapter\Zend\Client;
 use Http\Client\Tests\HttpClientTest;
+use Zend\Http\Client as ZendClient;
 
-class ClientTest extends HttpClientTest
+abstract class ClientTest extends HttpClientTest
 {
     protected function createHttpAdapter()
     {
-        return new Client();
+        return new Client(new ZendClient(null, [
+            'adapter' => $this->getZendAdapter(),
+            'maxredirects' => 0,
+            'storeresponse' => false,
+        ]));
+    }
+
+    abstract protected function getZendAdapter();
+
+    protected function shouldBeSkip($method, $uri, array $headers, $body)
+    {
+        if ($method === 'TRACE' && strlen($body) > 0) {
+            return "Zend Http Adapter does not work well with TRACE method and a BODY";
+        }
+
+        return false;
     }
 }

tests/CurlClientTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Http\Adapter\Zend\Tests;
+
+use Zend\Http\Client\Adapter\Curl;
+
+class CurlClientTest extends ClientTest
+{
+    protected function getZendAdapter()
+    {
+        return Curl::class;
+    }
+
+    protected function shouldBeSkip($method, $uri, array $headers, $body)
+    {
+        if (strlen($body) !== 0 && !in_array($method, ['POST', 'PUT', 'PATCH'], true)) {
+            return "Zend Curl Adapter does not support body in other method than POST, PUT or PATCH";
+        }
+
+        return parent::shouldBeSkip($method, $uri, $headers, $body);
+    }
+}

tests/SocketClientTest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Http\Adapter\Zend\Tests;
+
+use Zend\Http\Client\Adapter\Socket;
+
+class SocketClientTest extends ClientTest
+{
+    protected function getZendAdapter()
+    {
+        return Socket::class;
+    }
+}