Merge branch '5.4' into 6.2

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

Author: nicolas-grekas

Tests/AcceptHeaderItemTest.php

@@ -26,7 +26,7 @@ public function testFromString($string, $value, array $attributes)
         $this->assertEquals($attributes, $item->getAttributes());
     }
 
-    public function provideFromStringData()
+    public static function provideFromStringData()
     {
         return [
             [
@@ -57,7 +57,7 @@ public function testToString($value, array $attributes, $string)
         $this->assertEquals($string, (string) $item);
     }
 
-    public function provideToStringData()
+    public static function provideToStringData()
     {
         return [
             [

Tests/AcceptHeaderTest.php

@@ -37,7 +37,7 @@ public function testFromString($string, array $items)
         $this->assertEquals($items, $parsed);
     }
 
-    public function provideFromStringData()
+    public static function provideFromStringData()
     {
         return [
             ['', []],
@@ -57,7 +57,7 @@ public function testToString(array $items, $string)
         $this->assertEquals($string, (string) $header);
     }
 
-    public function provideToStringData()
+    public static function provideToStringData()
     {
         return [
             [[], ''],
@@ -76,7 +76,7 @@ public function testFilter($string, $filter, array $values)
         $this->assertEquals($values, array_keys($header->all()));
     }
 
-    public function provideFilterData()
+    public static function provideFilterData()
     {
         return [
             ['fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4', '/fr.*/', ['fr-FR', 'fr']],
@@ -92,7 +92,7 @@ public function testSorting($string, array $values)
         $this->assertEquals($values, array_keys($header->all()));
     }
 
-    public function provideSortingData()
+    public static function provideSortingData()
     {
         return [
             'quality has priority' => ['*;q=0.3,ISO-8859-1,utf-8;q=0.7', ['ISO-8859-1', 'utf-8', '*']],
@@ -110,7 +110,7 @@ public function testDefaultValue($acceptHeader, $value, $expectedQuality)
         $this->assertSame($expectedQuality, $header->get($value)->getQuality());
     }
 
-    public function provideDefaultValueData()
+    public static function provideDefaultValueData()
     {
         yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, *;q=0.3', 'text/xml', 0.3];
         yield ['text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/xml', 0.3];

Tests/BinaryFileResponseTest.php

@@ -142,7 +142,7 @@ public function testRequestsWithoutEtag($requestRange, $offset, $length, $respon
         $this->assertEquals($responseRange, $response->headers->get('Content-Range'));
     }
 
-    public function provideRanges()
+    public static function provideRanges()
     {
         return [
             ['bytes=1-4', 1, 4, 'bytes 1-4/35'],
@@ -196,7 +196,7 @@ public function testFullFileRequests($requestRange)
         $this->assertEquals(200, $response->getStatusCode());
     }
 
-    public function provideFullFileRanges()
+    public static function provideFullFileRanges()
     {
         return [
             ['bytes=0-'],
@@ -262,7 +262,7 @@ public function testInvalidRequests($requestRange)
         $this->assertEquals('bytes */35', $response->headers->get('Content-Range'));
     }
 
-    public function provideInvalidRanges()
+    public static function provideInvalidRanges()
     {
         return [
             ['bytes=-40'],
@@ -288,7 +288,7 @@ public function testXSendfile($file)
         $this->assertStringContainsString('README.md', $response->headers->get('X-Sendfile'));
     }
 
-    public function provideXSendfileFiles()
+    public static function provideXSendfileFiles()
     {
         return [
             [__DIR__.'/../README.md'],
@@ -354,7 +354,7 @@ public function testAcceptRangeNotOverriden()
         $this->assertEquals('foo', $response->headers->get('Accept-Ranges'));
     }
 
-    public function getSampleXAccelMappings()
+    public static function getSampleXAccelMappings()
     {
         return [
             ['/var/www/var/www/files/foo.txt', '/var/www/=/files/', '/files/var/www/files/foo.txt'],

Tests/CookieTest.php

@@ -24,7 +24,7 @@
  */
 class CookieTest extends TestCase
 {
-    public function namesWithSpecialCharacters()
+    public static function namesWithSpecialCharacters()
     {
         return [
             [',MyName'],

Tests/ExpressionRequestMatcherTest.php

@@ -54,7 +54,7 @@ public function testMatchesWhenParentMatchesIsFalse($expression)
         $this->assertFalse($expressionRequestMatcher->matches($request));
     }
 
-    public function provideExpressions()
+    public static function provideExpressions()
     {
         return [
             ['request.getMethod() == method', true],

Tests/File/FileTest.php

@@ -93,7 +93,7 @@ public function testGetContent()
         $this->assertStringEqualsFile(__FILE__, $file->getContent());
     }
 
-    public function getFilenameFixtures()
+    public static function getFilenameFixtures()
     {
         return [
             ['original.gif', 'original.gif'],

Tests/File/UploadedFileTest.php

@@ -156,7 +156,7 @@ public function testMoveLocalFileIsNotAllowed()
         $file->move(__DIR__.'/Fixtures/directory');
     }
 
-    public function failedUploadedFile()
+    public static function failedUploadedFile()
     {
         foreach ([\UPLOAD_ERR_INI_SIZE, \UPLOAD_ERR_FORM_SIZE, \UPLOAD_ERR_PARTIAL, \UPLOAD_ERR_NO_FILE, \UPLOAD_ERR_CANT_WRITE, \UPLOAD_ERR_NO_TMP_DIR, \UPLOAD_ERR_EXTENSION, -1] as $error) {
             yield [new UploadedFile(
@@ -283,7 +283,7 @@ public function testIsInvalidOnUploadError($error)
         $this->assertFalse($file->isValid());
     }
 
-    public function uploadedFileErrorProvider()
+    public static function uploadedFileErrorProvider()
     {
         return [
             [\UPLOAD_ERR_INI_SIZE],

Tests/HeaderUtilsTest.php

@@ -24,7 +24,7 @@ public function testSplit(array $expected, string $header, string $separator)
         $this->assertSame($expected, HeaderUtils::split($header, $separator));
     }
 
-    public function provideHeaderToSplit(): array
+    public static function provideHeaderToSplit(): array
     {
         return [
             [['foo=123', 'bar'], 'foo=123,bar', ','],
@@ -111,7 +111,7 @@ public function testMakeDisposition($disposition, $filename, $filenameFallback,
         $this->assertEquals($expected, HeaderUtils::makeDisposition($disposition, $filename, $filenameFallback));
     }
 
-    public function provideMakeDisposition()
+    public static function provideMakeDisposition()
     {
         return [
             ['attachment', 'foo.html', 'foo.html', 'attachment; filename=foo.html'],
@@ -132,7 +132,7 @@ public function testMakeDispositionFail($disposition, $filename)
         HeaderUtils::makeDisposition($disposition, $filename);
     }
 
-    public function provideMakeDispositionFail()
+    public static function provideMakeDispositionFail()
     {
         return [
             ['attachment', 'foo%20bar.html'],
@@ -152,7 +152,7 @@ public function testParseQuery(string $query, string $expected = null)
         $this->assertSame($expected ?? $query, http_build_query(HeaderUtils::parseQuery($query), '', '&'));
     }
 
-    public function provideParseQuery()
+    public static function provideParseQuery()
     {
         return [
             ['a=b&c=d'],

Tests/IpUtilsTest.php

@@ -27,7 +27,7 @@ public function testIpv4($matches, $remoteAddr, $cidr)
         $this->assertSame($matches, IpUtils::checkIp($remoteAddr, $cidr));
     }
 
-    public function getIpv4Data()
+    public static function getIpv4Data()
     {
         return [
             [true, '192.168.1.1', '192.168.1.1'],
@@ -58,7 +58,7 @@ public function testIpv6($matches, $remoteAddr, $cidr)
         $this->assertSame($matches, IpUtils::checkIp($remoteAddr, $cidr));
     }
 
-    public function getIpv6Data()
+    public static function getIpv6Data()
     {
         return [
             [true, '2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0::/65'],
@@ -103,7 +103,7 @@ public function testInvalidIpAddressesDoNotMatch($requestIp, $proxyIp)
         $this->assertFalse(IpUtils::checkIp4($requestIp, $proxyIp));
     }
 
-    public function invalidIpAddressData()
+    public static function invalidIpAddressData()
     {
         return [
             'invalid proxy wildcard' => ['192.168.20.13', '*'],
@@ -120,7 +120,7 @@ public function testAnonymize($ip, $expected)
         $this->assertSame($expected, IpUtils::anonymize($ip));
     }
 
-    public function anonymizedIpData()
+    public static function anonymizedIpData()
     {
         return [
             ['192.168.1.1', '192.168.1.0'],
@@ -146,7 +146,7 @@ public function testIp4SubnetMaskZero($matches, $remoteAddr, $cidr)
         $this->assertSame($matches, IpUtils::checkIp4($remoteAddr, $cidr));
     }
 
-    public function getIp4SubnetMaskZeroData()
+    public static function getIp4SubnetMaskZeroData()
     {
         return [
             [true, '1.2.3.4', '0.0.0.0/0'],

Tests/RateLimiter/AbstractRequestRateLimiterTest.php

@@ -33,7 +33,7 @@ public function testConsume(array $rateLimits, ?RateLimit $expected)
         $this->assertSame($expected, $rateLimiter->consume(new Request()));
     }
 
-    public function provideRateLimits()
+    public static function provideRateLimits()
     {
         $now = new \DateTimeImmutable();