Apply on request the version set in options parameters

Co-Authored-By: Mponos George <5675248+gmponos@users.noreply.github.com>
guzzle · May 14, 2023 · 3380b7d · 3380b7d
1 parent 3d12c4b
commit 3380b7d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -437,6 +437,10 @@ private function applyOptions(RequestInterface $request, array &$options): Reque
             }
         }
 
+        if (isset($options['version'])) {
+            $modify['version'] = $options['version'];
+        }
+
         $request = Psr7\Utils::modifyRequest($request, $modify);
         if ($request->getBody() instanceof Psr7\MultipartStream) {
             // Use a multipart/form-data POST if a Content-Type is not set.

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -708,6 +708,26 @@ public function testOnlyAddSchemeWhenHostIsPresent()
         );
     }
 
+    public function testThatVersionIsOverwrittenWhenSendingARequest()
+    {
+        $mockHandler = new MockHandler([new Response(), new Response()]);
+        $client = new Client(['handler'  => $mockHandler]);
+
+        $request = new Request('get', '/bar', [], null, '1.1');
+        $client->send($request, [RequestOptions::VERSION => '1.0']);
+        self::assertSame(
+            '1.0',
+            $mockHandler->getLastRequest()->getProtocolVersion()
+        );
+
+        $request = new Request('get', '/bar', [], null, '1.0');
+        $client->send($request, [RequestOptions::VERSION => '1.1']);
+        self::assertSame(
+            '1.1',
+            $mockHandler->getLastRequest()->getProtocolVersion()
+        );
+    }
+
     public function testHandlerIsCallable()
     {
         $this->expectException(\InvalidArgumentException::class);