[HttpClient] fix adding query string to relative URLs with scoped clients

Author: nicolas-grekas

ScopingHttpClient.php

@@ -71,11 +71,12 @@ public function request(string $method, string $url, array $options = []): Respo
                 throw $e;
             }
 
-            $options = self::mergeDefaultOptions($options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);
+            $defaultOptions = $this->defaultOptionsByRegexp[$this->defaultRegexp];
+            $options = self::mergeDefaultOptions($options, $defaultOptions, true);
             if (\is_string($options['base_uri'] ?? null)) {
                 $options['base_uri'] = self::parseUrl($options['base_uri']);
             }
-            $url = implode('', self::resolveUrl($url, $options['base_uri'] ?? null));
+            $url = implode('', self::resolveUrl($url, $options['base_uri'] ?? null, $defaultOptions['query'] ?? []));
         }
 
         foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {

Tests/ScopingHttpClientTest.php

@@ -30,9 +30,9 @@ public function testRelativeUrl()
     public function testRelativeUrlWithDefaultRegexp()
     {
         $mockClient = new MockHttpClient();
-        $client = new ScopingHttpClient($mockClient, ['.*' => ['base_uri' => 'http://example.com']], '.*');
+        $client = new ScopingHttpClient($mockClient, ['.*' => ['base_uri' => 'http://example.com', 'query' => ['a' => 'b']]], '.*');
 
-        $this->assertSame('http://example.com/foo', $client->request('GET', '/foo')->getInfo('url'));
+        $this->assertSame('http://example.com/foo?f=g&a=b', $client->request('GET', '/foo?f=g')->getInfo('url'));
     }
 
     /**