Merge branch '5.4' into 6.2

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

Author: nicolas-grekas

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

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

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 */
 

Tests/Matcher/Dumper/StaticPrefixCollectionTest.php

@@ -34,7 +34,7 @@ public function testGrouping(array $routes, $expected)
         $this->assertEquals($expected, $dumped);
     }
 
-    public function routeProvider()
+    public static function routeProvider()
     {
         return [
             'Simple - not nested' => [

Tests/Matcher/ExpressionLanguageProviderTest.php

@@ -59,7 +59,7 @@ public function testCompile(string $expression, string $expected)
         $this->assertSame($expected, $this->expressionLanguage->compile($expression));
     }
 
-    public function compileProvider(): iterable
+    public static function compileProvider(): iterable
     {
         return [
             ['env("APP_ENV")', '($context->getParameter(\'_functions\')->get(\'env\')("APP_ENV"))'],
@@ -76,7 +76,7 @@ public function testEvaluate(string $expression, $expected)
         $this->assertSame($expected, $this->expressionLanguage->evaluate($expression, ['context' => $this->context]));
     }
 
-    public function evaluateProvider(): iterable
+    public static function evaluateProvider(): iterable
     {
         return [
             ['env("APP_ENV")', 'test'],

Tests/RouteCompilerTest.php

@@ -32,7 +32,7 @@ public function testCompile($name, $arguments, $prefix, $regex, $variables, $tok
         $this->assertEquals($tokens, $compiled->getTokens(), $name.' (tokens)');
     }
 
-    public function provideCompileData()
+    public static function provideCompileData()
     {
         return [
             [
@@ -199,7 +199,7 @@ public function testCompileImplicitUtf8Data($name, $arguments, $prefix, $regex,
         $this->assertEquals($tokens, $compiled->getTokens(), $name.' (tokens)');
     }
 
-    public function provideCompileImplicitUtf8Data()
+    public static function provideCompileImplicitUtf8Data()
     {
         return [
             [
@@ -284,7 +284,7 @@ public function testRouteWithVariableNameStartingWithADigit($name)
         $route->compile();
     }
 
-    public function getVariableNamesStartingWithADigit()
+    public static function getVariableNamesStartingWithADigit()
     {
         return [
            ['09'],
@@ -312,7 +312,7 @@ public function testCompileWithHost($name, $arguments, $prefix, $regex, $variabl
         $this->assertEquals($hostTokens, $compiled->getHostTokens(), $name.' (host tokens)');
     }
 
-    public function provideCompileWithHostData()
+    public static function provideCompileWithHostData()
     {
         return [
             [
@@ -381,7 +381,7 @@ public function testRemoveCapturingGroup($regex, $requirement)
         $this->assertSame($regex, $route->compile()->getRegex());
     }
 
-    public function provideRemoveCapturingGroup()
+    public static function provideRemoveCapturingGroup()
     {
         yield ['{^/(?P<foo>a(?:b|c)(?:d|e)f)$}sD', 'a(b|c)(d|e)f'];
         yield ['{^/(?P<foo>a\(b\)c)$}sD', 'a\(b\)c'];