From 31ad3197779a38a52d95c05d8fb37ce757816fde Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 24 Jan 2023 15:02:24 +0100 Subject: [PATCH 1/5] Update license years (last time) --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 99757d5..7536cae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018-2023 Fabien Potencier +Copyright (c) 2018-present Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 18d906390ff1892e70687e2498a6138ca62ca3f0 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Wed, 8 Feb 2023 18:08:26 +0100 Subject: [PATCH 2/5] [HttpClient] Fix data collector --- DataCollector/HttpClientDataCollector.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DataCollector/HttpClientDataCollector.php b/DataCollector/HttpClientDataCollector.php index edd9d1c..1925786 100644 --- a/DataCollector/HttpClientDataCollector.php +++ b/DataCollector/HttpClientDataCollector.php @@ -43,8 +43,8 @@ public function collect(Request $request, Response $response, \Throwable $except public function lateCollect() { - $this->data['request_count'] = 0; - $this->data['error_count'] = 0; + $this->data['request_count'] = $this->data['request_count'] ?? 0; + $this->data['error_count'] = $this->data['error_count'] ?? 0; $this->data += ['clients' => []]; foreach ($this->clients as $name => $client) { @@ -59,7 +59,8 @@ public function lateCollect() $this->data['clients'][$name]['traces'] = array_merge($this->data['clients'][$name]['traces'], $traces); $this->data['request_count'] += \count($traces); - $this->data['error_count'] += $this->data['clients'][$name]['error_count'] += $errorCount; + $this->data['error_count'] += $errorCount; + $this->data['clients'][$name]['error_count'] += $errorCount; $client->reset(); } From 8f377d76e57f2cfa0f41f55e035ce6069f0f58bd Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 8 Feb 2023 13:58:45 +0100 Subject: [PATCH 3/5] [HttpClient] Fix over-encoding of URL parts to match browser's behavior --- HttpClientTrait.php | 27 ++++++++++++++++++++++++++- Tests/HttpClientTraitTest.php | 12 ++++++------ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/HttpClientTrait.php b/HttpClientTrait.php index 57ffc51..20c2ceb 100644 --- a/HttpClientTrait.php +++ b/HttpClientTrait.php @@ -547,7 +547,7 @@ private static function parseUrl(string $url, array $query = [], array $allowedS } // https://tools.ietf.org/html/rfc3986#section-3.3 - $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()*+,;=:@%]++#", function ($m) { return rawurlencode($m[0]); }, $parts[$part]); + $parts[$part] = preg_replace_callback("#[^-A-Za-z0-9._~!$&/'()[\]*+,;=:@\\\\^`{|}%]++#", function ($m) { return rawurlencode($m[0]); }, $parts[$part]); } return [ @@ -621,6 +621,31 @@ private static function mergeQueryString(?string $queryString, array $queryArray $queryArray = []; if ($queryString) { + if (str_contains($queryString, '%')) { + // https://tools.ietf.org/html/rfc3986#section-2.3 + some chars not encoded by browsers + $queryString = strtr($queryString, [ + '%21' => '!', + '%24' => '$', + '%28' => '(', + '%29' => ')', + '%2A' => '*', + '%2B' => '+', + '%2C' => ',', + '%2F' => '/', + '%3A' => ':', + '%3B' => ';', + '%40' => '@', + '%5B' => '[', + '%5C' => '\\', + '%5D' => ']', + '%5E' => '^', + '%60' => '`', + '%7B' => '{', + '%7C' => '|', + '%7D' => '}', + ]); + } + foreach (explode('&', $queryString) as $v) { $queryArray[rawurldecode(explode('=', $v, 2)[0])] = $v; } diff --git a/Tests/HttpClientTraitTest.php b/Tests/HttpClientTraitTest.php index b811626..5a5a42e 100644 --- a/Tests/HttpClientTraitTest.php +++ b/Tests/HttpClientTraitTest.php @@ -157,12 +157,12 @@ public function provideParseUrl(): iterable yield [['http:', null, null, null, null], 'http:']; yield [['http:', null, 'bar', null, null], 'http:bar']; yield [[null, null, 'bar', '?a=1&c=c', null], 'bar?a=a&b=b', ['b' => null, 'c' => 'c', 'a' => 1]]; - yield [[null, null, 'bar', '?a=b+c&b=b', null], 'bar?a=b+c', ['b' => 'b']]; - yield [[null, null, 'bar', '?a=b%2B%20c', null], 'bar?a=b+c', ['a' => 'b+ c']]; - yield [[null, null, 'bar', '?a%5Bb%5D=c', null], 'bar', ['a' => ['b' => 'c']]]; - yield [[null, null, 'bar', '?a%5Bb%5Bc%5D=d', null], 'bar?a[b[c]=d', []]; - yield [[null, null, 'bar', '?a%5Bb%5D%5Bc%5D=dd', null], 'bar?a[b][c]=d&e[f]=g', ['a' => ['b' => ['c' => 'dd']], 'e[f]' => null]]; - yield [[null, null, 'bar', '?a=b&a%5Bb%20c%5D=d&e%3Df=%E2%9C%93', null], 'bar?a=b', ['a' => ['b c' => 'd'], 'e=f' => '✓']]; + yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*+,;%3D:@%25\\^`{|}', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']]; + yield [[null, null, 'bar', '?a=b+%20c', null], 'bar?a=b+c', ['a' => 'b+ c']]; + yield [[null, null, 'bar', '?a[b]=c', null], 'bar', ['a' => ['b' => 'c']]]; + yield [[null, null, 'bar', '?a[b[c]=d', null], 'bar?a[b[c]=d', []]; + yield [[null, null, 'bar', '?a[b][c]=dd', null], 'bar?a[b][c]=d&e[f]=g', ['a' => ['b' => ['c' => 'dd']], 'e[f]' => null]]; + yield [[null, null, 'bar', '?a=b&a[b%20c]=d&e%3Df=%E2%9C%93', null], 'bar?a=b', ['a' => ['b c' => 'd'], 'e=f' => '✓']]; // IDNA 2008 compliance yield [['https:', '//xn--fuball-cta.test', null, null, null], 'https://fußball.test']; } From 2df0f5771e4d9da773b3636abbd3d59a2b33168a Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Wed, 14 Dec 2022 15:42:16 +0100 Subject: [PATCH 4/5] Migrate to `static` data providers using `rector/rector` --- Tests/EventSourceHttpClientTest.php | 2 +- Tests/Exception/HttpExceptionTraitTest.php | 2 +- Tests/HttpClientTraitTest.php | 12 ++++++------ Tests/HttpOptionsTest.php | 2 +- Tests/MockHttpClientTest.php | 8 ++++---- Tests/NoPrivateNetworkHttpClientTest.php | 2 +- Tests/Response/MockResponseTest.php | 2 +- Tests/Retry/GenericRetryStrategyTest.php | 6 +++--- Tests/ScopingHttpClientTest.php | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Tests/EventSourceHttpClientTest.php b/Tests/EventSourceHttpClientTest.php index b738c15..72eb74f 100644 --- a/Tests/EventSourceHttpClientTest.php +++ b/Tests/EventSourceHttpClientTest.php @@ -152,7 +152,7 @@ public function testContentType($contentType, $expected) } } - public function contentTypeProvider() + public static function contentTypeProvider() { return [ ['text/event-stream', true], diff --git a/Tests/Exception/HttpExceptionTraitTest.php b/Tests/Exception/HttpExceptionTraitTest.php index f7b4ce5..f2df403 100644 --- a/Tests/Exception/HttpExceptionTraitTest.php +++ b/Tests/Exception/HttpExceptionTraitTest.php @@ -20,7 +20,7 @@ */ class HttpExceptionTraitTest extends TestCase { - public function provideParseError(): iterable + public static function provideParseError(): iterable { $errorWithoutMessage = 'HTTP/1.1 400 Bad Request returned for "http://example.com".'; diff --git a/Tests/HttpClientTraitTest.php b/Tests/HttpClientTraitTest.php index 5a5a42e..baa97dd 100644 --- a/Tests/HttpClientTraitTest.php +++ b/Tests/HttpClientTraitTest.php @@ -37,7 +37,7 @@ public function testPrepareRequestUrl(string $expected, string $url, array $quer $this->assertSame($expected, implode('', $url)); } - public function providePrepareRequestUrl(): iterable + public static function providePrepareRequestUrl(): iterable { yield ['http://example.com/', 'http://example.com/']; yield ['http://example.com/?a=1&b=b', '.']; @@ -60,7 +60,7 @@ public function testResolveUrl(string $base, string $url, string $expected) /** * From https://github.com/guzzle/psr7/blob/master/tests/UriResoverTest.php. */ - public function provideResolveUrl(): array + public static function provideResolveUrl(): array { return [ [self::RFC3986_BASE, 'http:h', 'http:h'], @@ -148,7 +148,7 @@ public function testParseUrl(array $expected, string $url, array $query = []) $this->assertSame($expected, self::parseUrl($url, $query)); } - public function provideParseUrl(): iterable + public static function provideParseUrl(): iterable { yield [['http:', '//example.com', null, null, null], 'http://Example.coM:80']; yield [['https:', '//xn--dj-kia8a.example.com:8000', '/', null, null], 'https://DÉjà.Example.com:8000/']; @@ -175,7 +175,7 @@ public function testRemoveDotSegments($expected, $url) $this->assertSame($expected, self::removeDotSegments($url)); } - public function provideRemoveDotSegments() + public static function provideRemoveDotSegments() { yield ['', '']; yield ['', '.']; @@ -224,7 +224,7 @@ public function testSetJSONAndBodyOptions() self::prepareRequest('POST', 'http://example.com', ['json' => ['foo' => 'bar'], 'body' => ''], HttpClientInterface::OPTIONS_DEFAULTS); } - public function providePrepareAuthBasic() + public static function providePrepareAuthBasic() { yield ['foo:bar', 'Zm9vOmJhcg==']; yield [['foo', 'bar'], 'Zm9vOmJhcg==']; @@ -241,7 +241,7 @@ public function testPrepareAuthBasic($arg, $result) $this->assertSame('Authorization: Basic '.$result, $options['normalized_headers']['authorization'][0]); } - public function provideFingerprints() + public static function provideFingerprints() { foreach (['md5', 'sha1', 'sha256'] as $algo) { $hash = hash($algo, $algo); diff --git a/Tests/HttpOptionsTest.php b/Tests/HttpOptionsTest.php index df5cb39..9dbbff7 100644 --- a/Tests/HttpOptionsTest.php +++ b/Tests/HttpOptionsTest.php @@ -19,7 +19,7 @@ */ class HttpOptionsTest extends TestCase { - public function provideSetAuthBasic(): iterable + public static function provideSetAuthBasic(): iterable { yield ['user:password', 'user', 'password']; yield ['user:password', 'user:password']; diff --git a/Tests/MockHttpClientTest.php b/Tests/MockHttpClientTest.php index e06575c..8c697b4 100644 --- a/Tests/MockHttpClientTest.php +++ b/Tests/MockHttpClientTest.php @@ -42,7 +42,7 @@ public function testMocking($factory, array $expectedResponses) $this->assertSame(2, $client->getRequestsCount()); } - public function mockingProvider(): iterable + public static function mockingProvider(): iterable { yield 'callable' => [ static function (string $method, string $url, array $options = []) { @@ -112,7 +112,7 @@ public function testValidResponseFactory($responseFactory) $this->addToAssertionCount(1); } - public function validResponseFactoryProvider() + public static function validResponseFactoryProvider() { return [ [static function (): MockResponse { return new MockResponse(); }], @@ -138,7 +138,7 @@ public function testTransportExceptionThrowsIfPerformedMoreRequestsThanConfigure $client->request('POST', '/foo'); } - public function transportExceptionProvider(): iterable + public static function transportExceptionProvider(): iterable { yield 'array of callable' => [ [ @@ -179,7 +179,7 @@ public function testInvalidResponseFactory($responseFactory, string $expectedExc (new MockHttpClient($responseFactory))->request('GET', 'https://foo.bar'); } - public function invalidResponseFactoryProvider() + public static function invalidResponseFactoryProvider() { return [ [static function (): \Generator { yield new MockResponse(); }, 'The response factory passed to MockHttpClient must return/yield an instance of ResponseInterface, "Generator" given.'], diff --git a/Tests/NoPrivateNetworkHttpClientTest.php b/Tests/NoPrivateNetworkHttpClientTest.php index aabfe38..8c51e9e 100755 --- a/Tests/NoPrivateNetworkHttpClientTest.php +++ b/Tests/NoPrivateNetworkHttpClientTest.php @@ -22,7 +22,7 @@ class NoPrivateNetworkHttpClientTest extends TestCase { - public function getExcludeData(): array + public static function getExcludeData(): array { return [ // private diff --git a/Tests/Response/MockResponseTest.php b/Tests/Response/MockResponseTest.php index d6839fb..6b172b1 100644 --- a/Tests/Response/MockResponseTest.php +++ b/Tests/Response/MockResponseTest.php @@ -74,7 +74,7 @@ public function testUrlHttpMethodMockResponse() $this->assertSame($url, $responseMock->getRequestUrl()); } - public function toArrayErrors() + public static function toArrayErrors() { yield [ 'content' => '', diff --git a/Tests/Retry/GenericRetryStrategyTest.php b/Tests/Retry/GenericRetryStrategyTest.php index 98b6578..79fc375 100644 --- a/Tests/Retry/GenericRetryStrategyTest.php +++ b/Tests/Retry/GenericRetryStrategyTest.php @@ -41,14 +41,14 @@ public function testShouldNotRetry(string $method, int $code, ?TransportExceptio self::assertFalse($strategy->shouldRetry($this->getContext(0, $method, 'http://example.com/', $code), null, $exception)); } - public function provideRetryable(): iterable + public static function provideRetryable(): iterable { yield ['GET', 200, new TransportException()]; yield ['GET', 500, null]; yield ['POST', 429, null]; } - public function provideNotRetryable(): iterable + public static function provideNotRetryable(): iterable { yield ['POST', 200, null]; yield ['POST', 200, new TransportException()]; @@ -65,7 +65,7 @@ public function testGetDelay(int $delay, int $multiplier, int $maxDelay, int $pr self::assertSame($expectedDelay, $strategy->getDelay($this->getContext($previousRetries, 'GET', 'http://example.com/', 200), null, null)); } - public function provideDelay(): iterable + public static function provideDelay(): iterable { // delay, multiplier, maxDelay, retries, expectedDelay yield [1000, 1, 5000, 0, 1000]; diff --git a/Tests/ScopingHttpClientTest.php b/Tests/ScopingHttpClientTest.php index 078475b..3e02111 100644 --- a/Tests/ScopingHttpClientTest.php +++ b/Tests/ScopingHttpClientTest.php @@ -49,7 +49,7 @@ public function testMatchingUrls(string $regexp, string $url, array $options) $this->assertSame($options[$regexp]['case'], $requestedOptions['case']); } - public function provideMatchingUrls() + public static function provideMatchingUrls() { $defaultOptions = [ '.*/foo-bar' => ['case' => 1], From 6b88914a7f1bf144df15904f60a19be78a67a3b2 Mon Sep 17 00:00:00 2001 From: Antoine Lamirault Date: Fri, 17 Feb 2023 21:51:27 +0100 Subject: [PATCH 5/5] Fix phpdocs in HttpClient, HttpFoundation, HttpKernel, Intl components --- AmpHttpClient.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AmpHttpClient.php b/AmpHttpClient.php index 7d79de3..2ab7e27 100644 --- a/AmpHttpClient.php +++ b/AmpHttpClient.php @@ -54,11 +54,11 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface, private $multi; /** - * @param array $defaultOptions Default requests' options - * @param callable $clientConfigurator A callable that builds a {@see DelegateHttpClient} from a {@see PooledHttpClient}; - * passing null builds an {@see InterceptedHttpClient} with 2 retries on failures - * @param int $maxHostConnections The maximum number of connections to a single host - * @param int $maxPendingPushes The maximum number of pushed responses to accept in the queue + * @param array $defaultOptions Default requests' options + * @param callable|null $clientConfigurator A callable that builds a {@see DelegateHttpClient} from a {@see PooledHttpClient}; + * passing null builds an {@see InterceptedHttpClient} with 2 retries on failures + * @param int $maxHostConnections The maximum number of connections to a single host + * @param int $maxPendingPushes The maximum number of pushed responses to accept in the queue * * @see HttpClientInterface::OPTIONS_DEFAULTS for available options */