Merge branch '6.2' into 6.3

* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`

Author: nicolas-grekas

Tests/Comparator/ComparatorTest.php

@@ -37,7 +37,7 @@ public function testTestSucceeds(string $operator, string $target, string $teste
         $this->assertTrue($c->test($testedValue));
     }
 
-    public function provideMatches(): array
+    public static function provideMatches(): array
     {
         return [
             ['<', '1000', '500'],
@@ -63,7 +63,7 @@ public function testTestFails(string $operator, string $target, string $testedVa
         $this->assertFalse($c->test($testedValue));
     }
 
-    public function provideNonMatches(): array
+    public static function provideNonMatches(): array
     {
         return [
             ['>', '1000', '500'],

Tests/Comparator/DateComparatorTest.php

@@ -49,7 +49,7 @@ public function testTest($test, $match, $noMatch)
         }
     }
 
-    public function getTestData()
+    public static function getTestData()
     {
         return [
             ['< 2005-10-10', [strtotime('2005-10-09')], [strtotime('2005-10-15')]],

Tests/Comparator/NumberComparatorTest.php

@@ -51,7 +51,7 @@ public function testTest($test, $match, $noMatch)
         }
     }
 
-    public function getTestData()
+    public static function getTestData()
     {
         return [
             ['< 1000', ['500', '999'], ['1000', '1500']],
@@ -81,7 +81,7 @@ public function getTestData()
         ];
     }
 
-    public function getConstructorTestData()
+    public static function getConstructorTestData()
     {
         return [
             [

Tests/FinderTest.php

@@ -1432,7 +1432,7 @@ public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartF
         $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
     }
 
-    public function getContainsTestData()
+    public static function getContainsTestData()
     {
         return [
             ['', '', []],
@@ -1450,7 +1450,7 @@ public function getContainsTestData()
         ];
     }
 
-    public function getRegexNameTestData()
+    public static function getRegexNameTestData()
     {
         return [
             ['~.*t\\.p.+~i'],
@@ -1471,7 +1471,7 @@ public function testPath($matchPatterns, $noMatchPatterns, array $expected)
         $this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
     }
 
-    public function getTestPathData()
+    public static function getTestPathData()
     {
         return [
             ['', '', []],

Tests/GitignoreTest.php

@@ -392,7 +392,7 @@ public static function provider(): array
         return $cases;
     }
 
-    public function providerExtended(): array
+    public static function providerExtended(): array
     {
         $basicCases = self::provider();
 
@@ -479,7 +479,7 @@ public function testToRegexMatchingNegatedPatterns(array $gitignoreLines, array
         }
     }
 
-    public function provideNegatedPatternsCases(): iterable
+    public static function provideNegatedPatternsCases(): iterable
     {
         yield [
             [''],

Tests/Iterator/CustomFilterIteratorTest.php

@@ -33,7 +33,7 @@ public function testAccept($filters, $expected)
         $this->assertIterator($expected, $iterator);
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         return [
             [[fn (\SplFileInfo $fileinfo) => false], []],

Tests/Iterator/DateRangeFilterIteratorTest.php

@@ -30,7 +30,7 @@ public function testAccept($size, $expected)
         $this->assertIterator($expected, $iterator);
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         $since20YearsAgo = [
             '.git',

Tests/Iterator/DepthRangeFilterIteratorTest.php

@@ -30,7 +30,7 @@ public function testAccept($minDepth, $maxDepth, $expected)
         $this->assertEquals($expected, $actual);
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         $lessThan1 = [
             '.git',

Tests/Iterator/ExcludeDirectoryFilterIteratorTest.php

@@ -28,7 +28,7 @@ public function testAccept($directories, $expected)
         $this->assertIterator($expected, $iterator);
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         $foo = [
             '.bar',

Tests/Iterator/FileTypeFilterIteratorTest.php

@@ -27,7 +27,7 @@ public function testAccept($mode, $expected)
         $this->assertIterator($expected, $iterator);
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         $onlyFiles = [
             'test.py',

Tests/Iterator/FilecontentFilterIteratorTest.php

@@ -45,7 +45,7 @@ public function testFilter(\Iterator $inner, array $matchPatterns, array $noMatc
         $this->assertIterator($resultArray, $iterator);
     }
 
-    public function getTestFilterData()
+    public static function getTestFilterData()
     {
         $inner = new MockFileListIterator();
 

Tests/Iterator/FilenameFilterIteratorTest.php

@@ -27,7 +27,7 @@ public function testAccept($matchPatterns, $noMatchPatterns, $expected)
         $this->assertIterator($expected, $iterator);
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         return [
             [['test.*'], [], ['test.php', 'test.py']],

Tests/Iterator/MultiplePcreFilterIteratorTest.php

@@ -25,7 +25,7 @@ public function testIsRegex($string, $isRegex, $message)
         $this->assertEquals($isRegex, $testIterator->isRegex($string), $message);
     }
 
-    public function getIsRegexFixtures()
+    public static function getIsRegexFixtures()
     {
         yield ['foo', false, 'string'];
         yield [' foo ', false, '" " is not a valid delimiter'];

Tests/Iterator/PathFilterIteratorTest.php

@@ -24,7 +24,7 @@ public function testFilter(\Iterator $inner, array $matchPatterns, array $noMatc
         $this->assertIterator($resultArray, $iterator);
     }
 
-    public function getTestFilterData()
+    public static function getTestFilterData()
     {
         $inner = new MockFileListIterator();
 

Tests/Iterator/SizeRangeFilterIteratorTest.php

@@ -28,7 +28,7 @@ public function testAccept($size, $expected)
         $this->assertIterator($expected, $iterator);
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         $lessThan1KGreaterThan05K = [
             '.foo',

Tests/Iterator/SortableIteratorTest.php

@@ -68,7 +68,7 @@ public function testAccept($mode, $expected)
         }
     }
 
-    public function getAcceptData()
+    public static function getAcceptData()
     {
         $sortByName = [
             '.bar',

Tests/Iterator/VcsIgnoredFilterIteratorTest.php

@@ -59,7 +59,7 @@ public function testAccept(array $gitIgnoreFiles, array $otherFileNames, array $
         $this->assertIterator($this->toAbsolute($expectedResult), $iterator);
     }
 
-    public function getAcceptData(): iterable
+    public static function getAcceptData(): iterable
     {
         yield 'simple file' => [
             [