Merge pull request #61 from boesing/bugfix/http-version-float

Regression: non-float HTTP version detection

composer.json

@@ -27,6 +27,7 @@
         "laminas/laminas-validator": "^2.15"
     },
     "require-dev": {
+        "ext-curl": "*",
         "laminas/laminas-coding-standard": "~2.2.1",
         "phpunit/phpunit": "^9.5.5"
     },

src/Client/Adapter/Curl.php

@@ -23,8 +23,10 @@
 use function in_array;
 use function intval;
 use function is_array;
+use function is_float;
 use function is_numeric;
 use function is_resource;
+use function number_format;
 use function preg_match;
 use function preg_replace;
 use function preg_split;
@@ -334,7 +336,7 @@ public function connect($host, $port = 80, $secure = false)
      *
      * @param  string        $method
      * @param Uri $uri
-     * @param  float         $httpVersion
+     * @param  float|string  $httpVersion
      * @param  array         $headers
      * @param  string        $body
      * @return string        $request
@@ -344,8 +346,12 @@ public function connect($host, $port = 80, $secure = false)
      * @throws AdapterException\InvalidArgumentException If $method is currently not supported.
      * @throws AdapterException\TimeoutException If connection timed out.
      */
-    public function write($method, $uri, $httpVersion = 1.1, $headers = [], $body = '')
+    public function write($method, $uri, $httpVersion = '1.1', $headers = [], $body = '')
     {
+        if (is_float($httpVersion)) {
+            $httpVersion = number_format($httpVersion, 1, '.', '');
+        }
+
         // Make sure we're properly connected
         if (! $this->curl) {
             throw new AdapterException\RuntimeException('Trying to write but we are not connected');
@@ -442,7 +448,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = [], $body =
         }
 
         // get http version to use
-        $curlHttp = $httpVersion === 1.1 ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0;
+        $curlHttp = $httpVersion === '1.1' ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0;
 
         // mark as HTTP request and set HTTP method
         curl_setopt($this->curl, CURLOPT_HTTP_VERSION, $curlHttp);

test/Client/Adapter/CurlTest.php

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaminasTest\Http\Client\Adapter;
+
+use Laminas\Http\Client\Adapter\Curl;
+use Laminas\Uri\Uri;
+use PHPUnit\Framework\TestCase;
+
+use function curl_getinfo;
+
+use const CURL_HTTP_VERSION_1_0;
+use const CURL_HTTP_VERSION_1_1;
+use const CURLINFO_HTTP_VERSION;
+
+final class CurlTest extends TestCase
+{
+    /** @var Curl */
+    private $adapter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->adapter = new Curl();
+    }
+
+    /**
+     * @return iterable<non-empty-string,array{0:CURL_HTTP_VERSION_*,1:float}>
+     */
+    public function floatHttpVersions(): iterable
+    {
+        yield 'HTTP 1.0' => [CURL_HTTP_VERSION_1_0, 1.0];
+        yield 'HTTP 1.1' => [CURL_HTTP_VERSION_1_1, 1.1];
+    }
+
+    /**
+     * @return iterable<non-empty-string,array{0:CURL_HTTP_VERSION_*,1:float}>
+     */
+    public function httpVersions(): iterable
+    {
+        yield 'HTTP 1.0' => [CURL_HTTP_VERSION_1_0, '1.0'];
+        yield 'HTTP 1.1' => [CURL_HTTP_VERSION_1_1, '1.1'];
+    }
+
+    /**
+     * NOTE: This test is only needed for BC compatibility. The {@see \Laminas\Http\Client\Adapter\AdapterInterface}
+     *       has a default for "string" but "float" was used in {@see Curl::write()} due to the lack of strict types.
+     *
+     * @dataProvider floatHttpVersions
+     */
+    public function testWriteCanHandleFloatHttpVersion(int $expectedCurlOption, float $version): void
+    {
+        $this->adapter->connect('example.org');
+        $this->adapter->write('GET', new Uri('http://example.org:80/'), $version);
+        $handle = $this->adapter->getHandle();
+        self::assertNotNull($handle);
+        self::assertEquals($expectedCurlOption, curl_getinfo($handle, CURLINFO_HTTP_VERSION));
+    }
+
+    /**
+     * @dataProvider httpVersions
+     */
+    public function testWriteCanHandleStringHttpVersion(int $expectedCurlOption, string $version): void
+    {
+        $this->adapter->connect('example.org');
+        $this->adapter->write('GET', new Uri('http://example.org:80/'), $version);
+        $handle = $this->adapter->getHandle();
+        self::assertNotNull($handle);
+        self::assertEquals($expectedCurlOption, curl_getinfo($handle, CURLINFO_HTTP_VERSION));
+    }
+}

test/Client/CurlTest.php

@@ -16,7 +16,6 @@
 use function base64_encode;
 use function curl_getinfo;
 use function explode;
-use function extension_loaded;
 use function file_get_contents;
 use function filesize;
 use function fopen;
@@ -71,9 +70,6 @@ class CurlTest extends CommonHttpTests
 
     protected function setUp(): void
     {
-        if (! extension_loaded('curl')) {
-            $this->markTestSkipped('cURL is not installed, marking all Http Client Curl Adapter tests skipped.');
-        }
         parent::setUp();
     }