[HttpClient] Fix ScopingHttpClient to always pass base_uri as string instead of parsed array

santysisi · nicolas-grekas · commit e77930451d84 · 2025-12-10T13:18:19.000+01:00
diff --git a/HttpClientTrait.php b/HttpClientTrait.php
@@ -170,13 +170,14 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
             unset($options['auth_basic'], $options['auth_bearer']);
 
             // Parse base URI
-            if (\is_string($options['base_uri'])) {
-                $options['base_uri'] = self::parseUrl($options['base_uri']);
+            if (\is_string($baseUri = $options['base_uri'] ?? null)) {
+                $baseUri = self::parseUrl($baseUri);
             }
+            unset($options['base_uri']);
 
             // Validate and resolve URL
             $url = self::parseUrl($url, $options['query']);
-            $url = self::resolveUrl($url, $options['base_uri'], $defaultOptions['query'] ?? []);
+            $url = self::resolveUrl($url, $baseUri, $defaultOptions['query'] ?? []);
         }
 
         // Finalize normalization of options
diff --git a/RetryableHttpClient.php b/RetryableHttpClient.php
@@ -201,6 +201,8 @@ private static function shiftBaseUri(array $options, array &$baseUris): array
         if ($baseUris) {
             $baseUri = 1 < \count($baseUris) ? array_shift($baseUris) : current($baseUris);
             $options['base_uri'] = \is_array($baseUri) ? $baseUri[array_rand($baseUri)] : $baseUri;
+        } elseif (\is_array($options['base_uri'] ?? null)) {
+            unset($options['base_uri']);
         }
 
         return $options;
diff --git a/ScopingHttpClient.php b/ScopingHttpClient.php
@@ -56,9 +56,11 @@ public function request(string $method, string $url, array $options = []): Respo
     {
         $e = null;
         $url = self::parseUrl($url, $options['query'] ?? []);
+        $resolved = false;
 
         if (\is_string($options['base_uri'] ?? null)) {
             $options['base_uri'] = self::parseUrl($options['base_uri']);
+            $resolved = true;
         }
 
         try {
@@ -72,10 +74,15 @@ public function request(string $method, string $url, array $options = []): Respo
             $options = self::mergeDefaultOptions($options, $defaultOptions, true);
             if (\is_string($options['base_uri'] ?? null)) {
                 $options['base_uri'] = self::parseUrl($options['base_uri']);
+                $resolved = true;
             }
             $url = implode('', self::resolveUrl($url, $options['base_uri'] ?? null, $defaultOptions['query'] ?? []));
         }
 
+        if ($resolved) {
+            unset($options['base_uri']);
+        }
+
         foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {
             if (preg_match("{{$regexp}}A", $url)) {
                 if (null === $e || $regexp !== $this->defaultRegexp) {
diff --git a/Tests/ScopingHttpClientTest.php b/Tests/ScopingHttpClientTest.php
@@ -14,6 +14,9 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
+use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
+use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Component\HttpClient\ScopingHttpClient;
 
 class ScopingHttpClientTest extends TestCase
@@ -94,10 +97,31 @@ public function testForBaseUri()
         $client = ScopingHttpClient::forBaseUri(new MockHttpClient(null, null), 'http://example.com/foo');
 
         $response = $client->request('GET', '/bar');
-        $this->assertSame('http://example.com/foo', implode('', $response->getRequestOptions()['base_uri']));
         $this->assertSame('http://example.com/bar', $response->getInfo('url'));
 
         $response = $client->request('GET', 'http://foo.bar/');
-        $this->assertNull($response->getRequestOptions()['base_uri']);
+        $this->assertSame('http://foo.bar/', $response->getInfo('url'));
+    }
+
+    public function testRetryableHttpClientIntegration()
+    {
+        $responses = [
+            new MockResponse(info: ['http_code' => 503]),
+            new MockResponse(info: ['http_code' => 503]),
+            new MockResponse(info: ['http_code' => 503]),
+            new MockResponse(),
+        ];
+
+        $client = ScopingHttpClient::forBaseUri(
+            new RetryableHttpClient(
+                new MockHttpClient($responses),
+                new GenericRetryStrategy(delayMs: 0)
+            ),
+            'https://foo.example.com/app/',
+        );
+
+        $response = $client->request('GET', 'santysisi');
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame('https://foo.example.com/app/santysisi', $response->getInfo('url'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,8 @@ private static function shiftBaseUri(array $options, array &$baseUris): array`
`201`	`201`	`if ($baseUris) {`
`202`	`202`	`$baseUri = 1 < \count($baseUris) ? array_shift($baseUris) : current($baseUris);`
`203`	`203`	`$options['base_uri'] = \is_array($baseUri) ? $baseUri[array_rand($baseUri)] : $baseUri;`
	`204`	`+ } elseif (\is_array($options['base_uri'] ?? null)) {`
	`205`	`+ unset($options['base_uri']);`
`204`	`206`	`}`
`205`	`207`
`206`	`208`	`return $options;`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,11 @@ public function request(string $method, string $url, array $options = []): Respo`
`56`	`56`	`{`
`57`	`57`	`$e = null;`
`58`	`58`	`$url = self::parseUrl($url, $options['query'] ?? []);`
	`59`	`+ $resolved = false;`
`59`	`60`
`60`	`61`	`if (\is_string($options['base_uri'] ?? null)) {`
`61`	`62`	`$options['base_uri'] = self::parseUrl($options['base_uri']);`
	`63`	`+ $resolved = true;`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`try {`
`@@ -72,10 +74,15 @@ public function request(string $method, string $url, array $options = []): Respo`
`72`	`74`	`$options = self::mergeDefaultOptions($options, $defaultOptions, true);`
`73`	`75`	`if (\is_string($options['base_uri'] ?? null)) {`
`74`	`76`	`$options['base_uri'] = self::parseUrl($options['base_uri']);`
	`77`	`+ $resolved = true;`
`75`	`78`	`}`
`76`	`79`	`$url = implode('', self::resolveUrl($url, $options['base_uri'] ?? null, $defaultOptions['query'] ?? []));`
`77`	`80`	`}`
`78`	`81`
	`82`	`+ if ($resolved) {`
	`83`	`+ unset($options['base_uri']);`
	`84`	`+ }`
	`85`	`+`
`79`	`86`	`foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {`
`80`	`87`	`if (preg_match("{{$regexp}}A", $url)) {`
`81`	`88`	`if (null === $e \|\| $regexp !== $this->defaultRegexp) {`