Merge branch '5.4' into 6.2

* 5.4:
  Migrate to `static` data providers using `rector/rector`

Author: nicolas-grekas

Tests/DataCollector/HttpClientDataCollectorTest.php

@@ -179,7 +179,7 @@ public function testItGeneratesCurlCommandsAsExpected(array $request, string $ex
         self::assertEquals(sprintf($expectedCurlCommand, '\\' === \DIRECTORY_SEPARATOR ? '"' : "'"), $curlCommand);
     }
 
-    public function provideCurlRequests(): iterable
+    public static function provideCurlRequests(): iterable
     {
         yield 'GET' => [
             [

Tests/EventSourceHttpClientTest.php

@@ -152,7 +152,7 @@ public function testContentType($contentType, $expected)
         }
     }
 
-    public function contentTypeProvider()
+    public static function contentTypeProvider()
     {
         return [
             ['text/event-stream', true],

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".';
 

Tests/HttpClientTestCase.php

@@ -483,7 +483,7 @@ public function testRedirectWithAuth(string $url, bool $redirectWithAuth)
         }
     }
 
-    public function getRedirectWithAuthTests()
+    public static function getRedirectWithAuthTests()
     {
         return [
             'same host and port' => ['url' => 'http://localhost:8057/302', 'redirectWithAuth' => true],

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', '.'];
@@ -79,7 +79,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'],
@@ -167,7 +167,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/'];
@@ -194,7 +194,7 @@ public function testRemoveDotSegments($expected, $url)
         $this->assertSame($expected, self::removeDotSegments($url));
     }
 
-    public function provideRemoveDotSegments()
+    public static function provideRemoveDotSegments()
     {
         yield ['', ''];
         yield ['', '.'];
@@ -243,7 +243,7 @@ public function testSetJSONAndBodyOptions()
         self::prepareRequest('POST', 'http://example.com', ['json' => ['foo' => 'bar'], 'body' => '<html/>'], HttpClientInterface::OPTIONS_DEFAULTS);
     }
 
-    public function providePrepareAuthBasic()
+    public static function providePrepareAuthBasic()
     {
         yield ['foo:bar', 'Zm9vOmJhcg=='];
         yield [['foo', 'bar'], 'Zm9vOmJhcg=='];
@@ -260,7 +260,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);

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'];

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.'],

Tests/NoPrivateNetworkHttpClientTest.php

@@ -22,7 +22,7 @@
 
 class NoPrivateNetworkHttpClientTest extends TestCase
 {
-    public function getExcludeData(): array
+    public static function getExcludeData(): array
     {
         return [
             // private

Tests/Response/MockResponseTest.php

@@ -75,7 +75,7 @@ public function testUrlHttpMethodMockResponse()
         $this->assertSame($url, $responseMock->getRequestUrl());
     }
 
-    public function toArrayErrors()
+    public static function toArrayErrors()
     {
         yield [
             'content' => '',

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];