bug #41160 [HttpClient] Don't prepare the request in ScopingHttpClient (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 132e09fb00f2 · 2021-05-10T16:33:49.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] Don't prepare the request in ScopingHttpClient | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Spotted while working on #41159 (needed by it.) Commits ------- a53db83 [HttpClient] Don't prepare the request in ScopingHttpClient
diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/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;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public static function forBaseUri(HttpClientInterface $client, string $baseUri,`
`57`	`57`	`*/`
`58`	`58`	`public function request(string $method, string $url, array $options = []): ResponseInterface`
`59`	`59`	`{`
	`60`	`+ $e = null;`
`60`	`61`	`$url = self::parseUrl($url, $options['query'] ?? []);`
`61`	`62`
`62`	`63`	`if (\is_string($options['base_uri'] ?? null)) {`
`@@ -70,13 +71,18 @@ public function request(string $method, string $url, array $options = []): Respo`
`70`	`71`	`throw $e;`
`71`	`72`	`}`
`72`	`73`
`73`		`- [$url, $options] = self::prepareRequest($method, implode('', $url), $options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);`
`74`		`- < 8000 span class=pl-c1>$url = implode('', $url);`
	`74`	`+ $options = self::mergeDefaultOptions($options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);`
	`75`	`+ if (\is_string($options['base_uri'] ?? null)) {`
	`76`	`+ $options['base_uri'] = self::parseUrl($options['base_uri']);`
	`77`	`+ }`
	`78`	`+ $url = implode('', self::resolveUrl($url, $options['base_uri'] ?? null));`
`75`	`79`	`}`
`76`	`80`
`77`	`81`	`foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {`
`78`	`82`	`if (preg_match("{{$regexp}}A", $url)) {`
`79`		`- $options = self::mergeDefaultOptions($options, $defaultOptions, true);`
	`83`	`+ if (null === $e \|\| $regexp !== $this->defaultRegexp) {`
	`84`	`+ $options = self::mergeDefaultOptions($options, $defaultOptions, true);`
	`85`	`+ }`
`80`	`86`	`break;`
`81`	`87`	`}`
`82`	`88`	`}`