[HttpClient] Don't prepare the request in ScopingHttpClient
This commit is contained in:
parent
be480d8f97
commit
a53db83823
@ -57,6 +57,7 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface
|
|||||||
*/
|
*/
|
||||||
public function request(string $method, string $url, array $options = []): ResponseInterface
|
public function request(string $method, string $url, array $options = []): ResponseInterface
|
||||||
{
|
{
|
||||||
|
$e = null;
|
||||||
$url = self::parseUrl($url, $options['query'] ?? []);
|
$url = self::parseUrl($url, $options['query'] ?? []);
|
||||||
|
|
||||||
if (\is_string($options['base_uri'] ?? null)) {
|
if (\is_string($options['base_uri'] ?? null)) {
|
||||||
@ -70,13 +71,18 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface
|
|||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
|
||||||
[$url, $options] = self::prepareRequest($method, implode('', $url), $options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);
|
$options = self::mergeDefaultOptions($options, $this->defaultOptionsByRegexp[$this->defaultRegexp], true);
|
||||||
$url = implode('', $url);
|
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) {
|
foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {
|
||||||
if (preg_match("{{$regexp}}A", $url)) {
|
if (preg_match("{{$regexp}}A", $url)) {
|
||||||
|
if (null === $e || $regexp !== $this->defaultRegexp) {
|
||||||
$options = self::mergeDefaultOptions($options, $defaultOptions, true);
|
$options = self::mergeDefaultOptions($options, $defaultOptions, true);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user