[HttpClient] Don't prepare the request in ScopingHttpClient

Author: nicolas-grekas

ScopingHttpClient.php

@@ -57,6 +57,7 @@ public static function forBaseUri(HttpClientInterface $client, string $baseUri,
      */
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
+        $e = null;
         $url = self::parseUrl($url, $options['query'] ?? []);
 
         if (\is_string($options['base_uri'] ?? null)) {
@@ -70,13 +71,18 @@ public function request(string $method, string $url, array $options = []): Respo
                 throw $e;
             }
 
-            [$url, $options] = self::prepareRequest($method, implode('', $url), $options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);
-            $url = implode('', $url);
+            $options = self::mergeDefaultOptions($options, $this->defaultOptionsByRegexp[$this->defaultRegexp], 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));
         }
 
         foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {
             if (preg_match("{{$regexp}}A", $url)) {
-                $options = self::mergeDefaultOptions($options, $defaultOptions, true);
+                if (null === $e || $regexp !== $this->defaultRegexp) {
+                    $options = self::mergeDefaultOptions($options, $defaultOptions, true);
+                }
                 break;
             }
         }