diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicolas Grekas 2021-05-14 09:54:52 +02:00
parent 90666777c7
commit 5ccba2c3e5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/HttpClient/ScopingHttpClient.php
View File

@ -71,11 +71,12 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface
throw $e; 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)) { if (\is_string($options['base_uri'] ?? null)) {
$options['base_uri'] = self::parseUrl($options['base_uri']); $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) { foreach ($this->defaultOptionsByRegexp as $regexp => $defaultOptions) {

4
src/Symfony/Component/HttpClient/Tests/ScopingHttpClientTest.php
View File

@ -30,9 +30,9 @@ class ScopingHttpClientTest extends TestCase
public function testRelativeUrlWithDefaultRegexp() public function testRelativeUrlWithDefaultRegexp()
{ {
$mockClient = new MockHttpClient(); $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'));
} }
/** /**