Merge branch '6.2' into 6.3

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

Author: nicolas-grekas

Tests/Annotation/RouteTest.php

@@ -57,7 +57,7 @@ public function testLoadFromDoctrineAnnotation(string $methodName, string $gette
         $this->assertEquals($route->$getter(), $expectedReturn);
     }
 
-    public function getValidParameters(): iterable
+    public static function getValidParameters(): iterable
     {
         return [
             ['simplePath', 'getPath', '/Blog'],

Tests/Generator/UrlGeneratorTest.php

@@ -130,7 +130,7 @@ public function testAbsoluteUrlWithExtraParameters(string $expectedQueryString,
         $this->assertSame('http://localhost/app.php/testing'.$expectedQueryString, $url);
     }
 
-    public function valuesProvider(): array
+    public static function valuesProvider(): array
     {
         $stdClass = new \stdClass();
         $stdClass->baz = 'bar';
@@ -894,7 +894,7 @@ public function testGetRelativePath($sourcePath, $targetPath, $expectedPath)
         $this->assertSame($expectedPath, UrlGenerator::getRelativePath($sourcePath, $targetPath));
     }
 
-    public function provideRelativePaths()
+    public static function provideRelativePaths()
     {
         return [
             [
@@ -1036,7 +1036,7 @@ public function testLookRoundRequirementsInPath($expected, $path, $requirement)
         $this->assertSame($expected, $this->getGenerator($routes)->generate('test', ['foo' => 'a/b', 'baz' => 'c/d/e']));
     }
 
-    public function provideLookAroundRequirementsInPath()
+    public static function provideLookAroundRequirementsInPath()
     {
         yield ['/app.php/a/b/b%28ar/c/d/e', '/{foo}/b(ar/{baz}', '.+(?=/b\\(ar/)'];
         yield ['/app.php/a/b/bar/c/d/e', '/{foo}/bar/{baz}', '.+(?!$)'];

Tests/Loader/AnnotationClassLoaderTestCase.php

@@ -30,7 +30,7 @@ public function testSupportsChecksResource($resource, $expectedSupports)
         $this->assertSame($expectedSupports, $this->loader->supports($resource), '->supports() returns true if the resource is loadable');
     }
 
-    public function provideTestSupportsChecksResource()
+    public static function provideTestSupportsChecksResource()
     {
         return [
             ['class', true],

Tests/Loader/ContainerLoaderTest.php

@@ -25,7 +25,7 @@ public function testSupports(bool $expected, string $type = null)
         $this->assertSame($expected, (new ContainerLoader(new Container()))->supports('foo', $type));
     }
 
-    public function supportsProvider()
+    public static function supportsProvider()
     {
         return [
             [true, 'service'],

Tests/Loader/ObjectLoaderTest.php

@@ -50,7 +50,7 @@ public function testExceptionWithoutSyntax(string $resourceString)
         $loader->load($resourceString);
     }
 
-    public function getBadResourceStrings()
+    public static function getBadResourceStrings()
     {
         return [
             ['Foo:Bar:baz'],

Tests/Loader/PhpFileLoaderTest.php

@@ -324,7 +324,7 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec
         $this->assertSame(MyController::class.'::__invoke', $route->getDefault('_controller'));
     }
 
-    public function providePsr4ConfigFiles(): array
+    public static function providePsr4ConfigFiles(): array
     {
         return [
             ['psr4-attributes.php'],

Tests/Loader/Psr4DirectoryLoaderTest.php

@@ -81,7 +81,7 @@ public function testPsr4NamespaceTrim(string $namespace)
         $this->assertSame(MyController::class.'::__invoke', $route->getDefault('_controller'));
     }
 
-    public function provideNamespacesThatNeedTrimming(): array
+    public static function provideNamespacesThatNeedTrimming(): array
     {
         return [
             ['\\Symfony\Component\Routing\Tests\Fixtures\Psr4Controllers'],

Tests/Loader/XmlFileLoaderTest.php

@@ -234,7 +234,7 @@ public function testLoadThrowsExceptionWithInvalidFileEvenWithoutSchemaValidatio
         $loader->load($filePath);
     }
 
-    public function getPathsToInvalidFiles()
+    public static function getPathsToInvalidFiles()
     {
         return [
             ['nonvalidnode.xml'],
@@ -482,7 +482,7 @@ public function testImportRouteWithController($file)
         $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
     }
 
-    public function provideFilesImportingRoutesWithControllers()
+    public static function provideFilesImportingRoutesWithControllers()
     {
         yield ['import_controller.xml'];
         yield ['import__controller.xml'];
@@ -619,7 +619,7 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec
         $this->assertSame(MyController::class.'::__invoke', $route->getDefault('_controller'));
     }
 
-    public function providePsr4ConfigFiles(): array
+    public static function providePsr4ConfigFiles(): array
     {
         return [
             ['psr4-attributes.xml'],

Tests/Loader/YamlFileLoaderTest.php

@@ -56,7 +56,7 @@ public function testLoadThrowsExceptionWithInvalidFile($filePath)
         $loader->load($filePath);
     }
 
-    public function getPathsToInvalidFiles()
+    public static function getPathsToInvalidFiles()
     {
         return [
             ['nonvalid.yml'],
@@ -175,7 +175,7 @@ public function testImportRouteWithController($file)
         $this->assertSame('FrameworkBundle:Template:template', $route->getDefault('_controller'));
     }
 
-    public function provideFilesImportingRoutesWithControllers()
+    public static function provideFilesImportingRoutesWithControllers()
     {
         yield ['import_controller.yml'];
         yield ['import__controller.yml'];
@@ -485,7 +485,7 @@ protected function configureRoute(Route $route, \ReflectionClass $class, \Reflec
         $this->assertSame(MyController::class.'::__invoke', $route->getDefault('_controller'));
     }
 
-    public function providePsr4ConfigFiles(): array
+    public static function providePsr4ConfigFiles(): array
     {
         return [
             ['psr4-attributes.yaml'],

Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php

@@ -65,7 +65,7 @@ public function testDump(RouteCollection $collection, $fixture)
         $this->assertStringEqualsFile($basePath.$fixture, $dumper->dump());
     }
 
-    public function getRouteCollections()
+    public static function getRouteCollections()
     {
         /* test case 1 */