Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 6c910f3a05a0 · 2023-02-14T09:44:56.000+01:00
* 5.4:
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/AliasTest.php b/Tests/AliasTest.php
@@ -79,7 +79,7 @@ public function testCannotDeprecateWithAnInvalidTemplate($message)
         $def->setDeprecated('package', '1.1', $message);
     }
 
-    public function invalidDeprecationMessageProvider()
+    public static function invalidDeprecationMessageProvider()
     {
         return [
             "With \rs" => ["invalid \r message %alias_id%"],
diff --git a/Tests/Argument/TaggedIteratorArgumentTest.php b/Tests/Argument/TaggedIteratorArgumentTest.php
@@ -67,7 +67,7 @@ public function testDefaultIndexMethod(?string $indexAttribute, ?string $default
         $this->assertSame($expectedDefaultIndexMethod, $taggedIteratorArgument->getDefaultIndexMethod());
     }
 
-    public function defaultIndexMethodProvider()
+    public static function defaultIndexMethodProvider()
     {
         yield 'No indexAttribute and no defaultIndexMethod' => [
             null,
@@ -116,7 +116,7 @@ public function testDefaultPriorityIndexMethod(?string $indexAttribute, ?string
         $this->assertSame($expectedDefaultPriorityMethod, $taggedIteratorArgument->getDefaultPriorityMethod());
     }
 
-    public function defaultPriorityMethodProvider()
+    public static function defaultPriorityMethodProvider()
     {
         yield 'No indexAttribute and no defaultPriorityMethod' => [
             null,
diff --git a/Tests/ChildDefinitionTest.php b/Tests/ChildDefinitionTest.php
@@ -40,7 +40,7 @@ public function testSetProperty($property, $changeKey)
         $this->assertSame([$changeKey => true], $def->getChanges());
     }
 
-    public function getPropertyTests()
+    public static function getPropertyTests()
     {
         return [
             ['class', 'class'],
diff --git a/Tests/Compiler/AliasDeprecatedPublicServicesPassTest.php b/Tests/Compiler/AliasDeprecatedPublicServicesPassTest.php
@@ -58,7 +58,7 @@ public function testProcessWithMissingAttribute(string $attribute, array $attrib
         (new AliasDeprecatedPublicServicesPass())->process($container);
     }
 
-    public function processWithMissingAttributeProvider()
+    public static function processWithMissingAttributeProvider()
     {
         return [
             ['package', ['version' => '1.2']],
diff --git a/Tests/Compiler/AutowirePassTest.php b/Tests/Compiler/AutowirePassTest.php
@@ -911,7 +911,7 @@ public function testNotWireableCalls($method, $expectedMsg)
         }
     }
 
-    public function provideNotWireableCalls()
+    public static function provideNotWireableCalls()
     {
         return [
             ['setNotAutowireable', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireable()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.'],
diff --git a/Tests/Compiler/CheckArgumentsValidityPassTest.php b/Tests/Compiler/CheckArgumentsValidityPassTest.php
@@ -56,7 +56,7 @@ public function testException(array $arguments, array $methodCalls)
         $pass->process($container);
     }
 
-    public function definitionProvider()
+    public static function definitionProvider()
     {
         return [
             [['a' => 'a', null], []],
diff --git a/Tests/Compiler/IntegrationTest.php b/Tests/Compiler/IntegrationTest.php
@@ -268,7 +268,7 @@ public function testYamlContainerCompiles($directory, $actualServiceId, $expecte
         $this->assertEquals($expectedService, $actualService);
     }
 
-    public function getYamlCompileTests()
+    public static function getYamlCompileTests()
     {
         $container = new ContainerBuilder();
         $container->registerForAutoconfiguration(IntegrationTestStub::class);
diff --git a/Tests/Compiler/PriorityTaggedServiceTraitTest.php b/Tests/Compiler/PriorityTaggedServiceTraitTest.php
@@ -182,7 +182,7 @@ public function testTheIndexedTagsByDefaultIndexMethodFailure(string $defaultInd
         $priorityTaggedServiceTraitImplementation->test($tag, $container);
     }
 
-    public function provideInvalidDefaultMethods(): iterable
+    public static function provideInvalidDefaultMethods(): iterable
     {
         yield ['getMethodShouldBeStatic', null, sprintf('Method "%s::getMethodShouldBeStatic()" should be static.', FooTaggedForInvalidDefaultMethodClass::class)];
         yield ['getMethodShouldBeStatic', 'foo', sprintf('Either method "%s::getMethodShouldBeStatic()" should be static or tag "my_custom_tag" on service "service1" is missing attribute "foo".', FooTaggedForInvalidDefaultMethodClass::class)];
diff --git a/Tests/Compiler/ResolveClassPassTest.php b/Tests/Compiler/ResolveClassPassTest.php
@@ -33,7 +33,7 @@ public function testResolveClassFromId($serviceId)
         $this->assertSame($serviceId, $def->getClass());
     }
 
-    public function provideValidClassId()
+    public static function provideValidClassId()
     {
         yield ['Acme\UnknownClass'];
         yield [CaseSensitiveClass::class];
@@ -52,7 +52,7 @@ public function testWontResolveClassFromId($serviceId)
         $this->assertNull($def->getClass());
     }
 
-    public function provideInvalidClassId()
+    public static function provideInvalidClassId()
     {
         yield [\stdClass::class];
         yield ['bar'];
diff --git a/Tests/Compiler/ResolveFactoryClassPassTest.php b/Tests/Compiler/ResolveFactoryClassPassTest.php
@@ -46,7 +46,7 @@ public function testInlinedDefinitionFactoryIsProcessed()
         $this->assertSame(['Baz\Qux', 'getInstance'], $factory->getFactory()[0]->getFactory());
     }
 
-    public function provideFulfilledFactories()
+    public static function provideFulfilledFactories()
     {
         return [
             [['Foo\Bar', 'create']],
diff --git a/Tests/ContainerBuilderTest.php b/Tests/ContainerBuilderTest.php
@@ -211,7 +211,7 @@ public function testBadDefinitionId($id)
         $builder->setDefinition($id, new Definition('Foo'));
     }
 
-    public function provideBadId()
+    public static function provideBadId()
     {
         return [
             [''],
@@ -1511,7 +1511,7 @@ public function testAlmostCircular($visibility)
         $this->assertInstanceOf(\stdClass::class, $listener4);
     }
 
-    public function provideAlmostCircular()
+    public static function provideAlmostCircular()
     {
         yield ['public'];
         yield ['private'];
diff --git a/Tests/ContainerTest.php b/Tests/ContainerTest.php
@@ -40,7 +40,7 @@ public function testCamelize($id, $expected)
         $this->assertEquals($expected, Container::camelize($id), sprintf('Container::camelize("%s")', $id));
     }
 
-    public function dataForTestCamelize()
+    public static function dataForTestCamelize()
     {
         return [
             ['foo_bar', 'FooBar'],
@@ -64,7 +64,7 @@ public function testUnderscore($id, $expected)
         $this->assertEquals($expected, Container::underscore($id), sprintf('Container::underscore("%s")', $id));
     }
 
-    public function dataForTestUnderscore()
+    public static function dataForTestUnderscore()
     {
         return [
             ['FooBar', 'foo_bar'],
diff --git a/Tests/CrossCheckTest.php b/Tests/CrossCheckTest.php
@@ -71,7 +71,7 @@ public function testCrossCheck($fixture, $type)
         $this->assertEquals($services2, $services1, 'Iterator on the containers returns the same services');
     }
 
-    public function crossCheckLoadersDumpers()
+    public static function crossCheckLoadersDumpers()
     {
         return [
             ['services1.xml', 'xml'],
diff --git a/Tests/DefinitionTest.php b/Tests/DefinitionTest.php
@@ -194,7 +194,7 @@ public function testSetDeprecatedWithInvalidDeprecationTemplate($message)
         $def->setDeprecated('vendor/package', '1.1', $message);
     }
 
-    public function invalidDeprecationMessageProvider()
+    public static function invalidDeprecationMessageProvider()
     {
         return [
             "With \rs" => ["invalid \r message %service_id%"],
diff --git a/Tests/Dumper/PhpDumperTest.php b/Tests/Dumper/PhpDumperTest.php
@@ -394,7 +394,7 @@ public function testInvalidFactories($factory)
         $dumper->dump();
     }
 
-    public function provideInvalidFactories()
+    public static function provideInvalidFactories()
     {
         return [
             [['', 'method']],
@@ -1102,7 +1102,7 @@ public function testAlmostCircular($visibility)
         $this->assertInstanceOf(\stdClass::class, $listener4);
     }
 
-    public function provideAlmostCircular()
+    public static function provideAlmostCircular()
     {
         yield ['public'];
         yield ['private'];
diff --git a/Tests/Dumper/XmlDumperTest.php b/Tests/Dumper/XmlDumperTest.php
@@ -115,7 +115,7 @@ public function testDumpDecoratedServices($expectedXmlDump, $container)
         $this->assertEquals($expectedXmlDump, $dumper->dump());
     }
 
-    public function provideDecoratedServicesData()
+    public static function provideDecoratedServicesData()
     {
         $fixturesPath = realpath(__DIR__.'/../Fixtures/');
 
@@ -161,7 +161,7 @@ public function testCompiledContainerCanBeDumped($containerFile)
         $this->addToAssertionCount(1);
     }
 
-    public function provideCompiledContainerData()
+    public static function provideCompiledContainerData()
     {
         return [
             ['container8'],
diff --git a/Tests/EnvVarProcessorTest.php b/Tests/EnvVarProcessorTest.php
@@ -45,7 +45,7 @@ public function testGetEnvString($value, $processed)
         $this->assertSame($processed, $result);
     }
 
-    public function validStrings()
+    public static function validStrings()
     {
         return [
             ['hello', 'hello'],
@@ -91,7 +91,7 @@ public function testGetEnvNot($value, $processed)
         $this->assertSame(!$processed, $result);
     }
 
-    public function validBools()
+    public static function validBools()
     {
         return [
             ['true', true],
@@ -120,7 +120,7 @@ public function testGetEnvInt($value, $processed)
         $this->assertSame($processed, $result);
     }
 
-    public function validInts()
+    public static function validInts()
     {
         return [
             ['1', 1],
@@ -145,7 +145,7 @@ public function testGetEnvIntInvalid($value)
         });
     }
 
-    public function invalidInts()
+    public static function invalidInts()
     {
         return [
             ['foo'],
@@ -170,7 +170,7 @@ public function testGetEnvFloat($value, $processed)
         $this->assertSame($processed, $result);
     }
 
-    public function validFloats()
+    public static function validFloats()
     {
         return [
             ['1', 1.0],
@@ -195,7 +195,7 @@ public function testGetEnvFloatInvalid($value)
         });
     }
 
-    public function invalidFloats()
+    public static function invalidFloats()
     {
         return [
             ['foo'],
@@ -220,7 +220,7 @@ public function testGetEnvConst($value, $processed)
         $this->assertSame($processed, $result);
     }
 
-    public function validConsts()
+    public static function validConsts()
     {
         return [
             ['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::TEST_CONST', self::TEST_CONST],
@@ -244,7 +244,7 @@ public function testGetEnvConstInvalid($value)
         });
     }
 
-    public function invalidConsts()
+    public static function invalidConsts()
     {
         return [
             ['Symfony\Component\DependencyInjection\Tests\EnvVarProcessorTest::UNDEFINED_CONST'],
@@ -300,7 +300,7 @@ public function testGetEnvJson($value, $processed)
         $this->assertSame($processed, $result);
     }
 
-    public function validJson()
+    public static function validJson()
     {
         return [
             ['[1]', [1]],
@@ -338,7 +338,7 @@ public function testGetEnvJsonOther($value)
         });
     }
 
-    public function otherJsonValues()
+    public static function otherJsonValues()
     {
         return [
             [1],
@@ -389,7 +389,7 @@ public function testGetEnvKeyNoArrayResult($value)
         });
     }
 
-    public function noArrayValues()
+    public static function noArrayValues()
     {
         return [
             [null],
@@ -415,7 +415,7 @@ public function testGetEnvKeyArrayKeyNotFound($value)
         });
     }
 
-    public function invalidArrayValues()
+    public static function invalidArrayValues()
     {
         return [
             [[]],
@@ -438,7 +438,7 @@ public function testGetEnvKey($value)
         }));
     }
 
-    public function arrayValues()
+    public static function arrayValues()
     {
         return [
             [['index' => 'password']],
@@ -482,7 +482,7 @@ public function testGetEnvEnum(\BackedEnum $backedEnum)
         $this->assertSame($backedEnum, $result);
     }
 
-    public function provideGetEnvEnum(): iterable
+    public static function provideGetEnvEnum(): iterable
     {
         return [
             [StringBackedEnum::Bar],
@@ -552,7 +552,7 @@ public function testGetEnvNullable($value, $processed)
         $this->assertSame($processed, $result);
     }
 
-    public function validNullables()
+    public static function validNullables()
     {
         return [
             ['hello', 'hello'],
@@ -607,7 +607,7 @@ public function testGetEnvResolve($value, $processed)
         $this->assertSame($processed, $result);
     }
 
-    public function validResolve()
+    public static function validResolve()
     {
         return [
             ['string', 'string'],
@@ -648,7 +648,7 @@ public function testGetEnvResolveNotScalar($value)
         });
     }
 
-    public function notScalarResolve()
+    public static function notScalarResolve()
     {
         return [
             [null],
@@ -725,7 +725,7 @@ public function testGetEnvShuffleInvalid()
         (new EnvVarProcessor(new Container()))->getEnv('shuffle', 'foo', fn () => 'bar');
     }
 
-    public function validCsv()
+    public static function validCsv()
     {
         $complex = <<<'CSV'
 ,"""","foo""","\""",\,foo\
@@ -840,7 +840,7 @@ public function testGetEnvUrlPath(?string $expected, string $url)
         })['path']);
     }
 
-    public function provideGetEnvUrlPath()
+    public static function provideGetEnvUrlPath()
     {
         return [
             ['', 'https://symfony.com'],
diff --git a/Tests/Exception/InvalidParameterTypeExceptionTest.php b/Tests/Exception/InvalidParameterTypeExceptionTest.php
@@ -26,7 +26,7 @@ public function testExceptionMessage(\ReflectionParameter $parameter, string $ex
         self::assertSame($expectedMessage, $exception->getMessage());
     }
 
-    public function provideReflectionParameters(): iterable
+    public static function provideReflectionParameters(): iterable
     {
         yield 'static method' => [
             new \ReflectionParameter([MyClass::class, 'doSomething'], 0),
diff --git a/Tests/Extension/ExtensionTest.php b/Tests/Extension/ExtensionTest.php
@@ -32,7 +32,7 @@ public function testIsConfigEnabledReturnsTheResolvedValue($enabled)
         $this->assertSame($enabled, $extension->isConfigEnabled(new ContainerBuilder(), ['enabled' => $enabled]));
     }
 
-    public function getResolvedEnabledFixtures()
+    public static function getResolvedEnabledFixtures()
     {
         return [
             [true],
diff --git a/Tests/Loader/Configurator/EnvConfiguratorTest.php b/Tests/Loader/Configurator/EnvConfiguratorTest.php
@@ -25,7 +25,7 @@ public function test(string $expected, EnvConfigurator $envConfigurator)
         $this->assertSame($expected, (string) $envConfigurator);
     }
 
-    public function provide(): iterable
+    public static function provide(): iterable
     {
         yield ['%env(FOO)%', new EnvConfigurator('FOO')];
         yield ['%env(string:FOO)%', new EnvConfigurator('string:FOO')];
diff --git a/Tests/Loader/FileLoaderTest.php b/Tests/Loader/FileLoaderTest.php
diff --git a/Tests/Loader/IniFileLoaderTest.php b/Tests/Loader/IniFileLoaderTest.php
diff --git a/Tests/Loader/LoaderResolverTest.php b/Tests/Loader/LoaderResolverTest.php
diff --git a/Tests/Loader/PhpFileLoaderTest.php b/Tests/Loader/PhpFileLoaderTest.php
diff --git a/Tests/Loader/XmlFileLoaderTest.php b/Tests/Loader/XmlFileLoaderTest.php
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
diff --git a/Tests/ParameterBag/ParameterBagTest.php b/Tests/ParameterBag/ParameterBagTest.php

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function testCannotDeprecateWithAnInvalidTemplate($message)`
`79`	`79`	`$def->setDeprecated('package', '1.1', $message);`
`80`	`80`	`}`
`81`	`81`
`82`		`- public function invalidDeprecationMessageProvider()`
	`82`	`+ public static function invalidDeprecationMessageProvider()`
`83`	`83`	`{`
`84`	`84`	`return [`
`85`	`85`	`"With \rs" => ["invalid \r message %alias_id%"],`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function testDefaultIndexMethod(?string $indexAttribute, ?string $default`
`67`	`67`	`$this->assertSame($expectedDefaultIndexMethod, $taggedIteratorArgument->getDefaultIndexMethod());`
`68`	`68`	`}`
`69`	`69`
`70`		`- public function defaultIndexMethodProvider()`
	`70`	`+ public static function defaultIndexMethodProvider()`
`71`	`71`	`{`
`72`	`72`	`yield 'No indexAttribute and no defaultIndexMethod' => [`
`73`	`73`	`null,`
`@@ -116,7 +116,7 @@ public function testDefaultPriorityIndexMethod(?string $indexAttribute, ?string`
`116`	`116`	`$this->assertSame($expectedDefaultPriorityMethod, $taggedIteratorArgument->getDefaultPriorityMethod());`
`117`	`117`	`}`
`118`	`118`
`119`		`- public function defaultPriorityMethodProvider()`
	`119`	`+ public static function defaultPriorityMethodProvider()`
`120`	`120`	`{`
`121`	`121`	`yield 'No indexAttribute and no defaultPriorityMethod' => [`
`122`	`122`	`null,`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function testSetProperty($property, $changeKey)`
`40`	`40`	`$this->assertSame([$changeKey => true], $def->getChanges());`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function getPropertyTests()`
	`43`	`+ public static function getPropertyTests()`
`44`	`44`	`{`
`45`	`45`	`return [`
`46`	`46`	`['class', 'class'],`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function testProcessWithMissingAttribute(string $attribute, array $attrib`
`58`	`58`	`(new AliasDeprecatedPublicServicesPass())->process($container);`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function processWithMissingAttributeProvider()`
	`61`	`+ public static function processWithMissingAttributeProvider()`
`62`	`62`	`{`
`63`	`63`	`return [`
`64`	`64`	`['package', ['version' => '1.2']],`
Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ public function testNotWireableCalls($method, $expectedMsg)`
`911`	`911`	`}`
`912`	`912`	`}`
`913`	`913`
`914`		`- public function provideNotWireableCalls()`
	`914`	`+ public static function provideNotWireableCalls()`
`915`	`915`	`{`
`916`	`916`	`return [`
`917`	`917`	`['setNotAutowireable', 'Cannot autowire service "foo": argument "$n" of method "Symfony\Component\DependencyInjection\Tests\Compiler\NotWireable::setNotAutowireable()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\NotARealClass" but this class was not found.'],`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function testException(array $arguments, array $methodCalls)`
`56`	`56`	`$pass->process($container);`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function definitionProvider()`
	`59`	`+ public static function definitionProvider()`
`60`	`60`	`{`
`61`	`61`	`return [`
`62`	`62`	`[['a' => 'a', null], []],`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public function testYamlContainerCompiles($directory, $actualServiceId, $expecte`
`268`	`268`	`$this->assertEquals($expectedService, $actualService);`
`269`	`269`	`}`
`270`	`270`
`271`		`- public function getYamlCompileTests()`
	`271`	`+ public static function getYamlCompileTests()`
`272`	`272`	`{`
`273`	`273`	`$container = new ContainerBuilder();`
`274`	`274`	`$container->registerForAutoconfiguration(IntegrationTestStub::class);`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function testTheIndexedTagsByDefaultIndexMethodFailure(string $defaultInd`
`182`	`182`	`$priorityTaggedServiceTraitImplementation->test($tag, $container);`
`183`	`183`	`}`
`184`	`184`
`185`		`- public function provideInvalidDefaultMethods(): iterable`
	`185`	`+ public static function provideInvalidDefaultMethods(): iterable`
`186`	`186`	`{`
`187`	`187`	`yield ['getMethodShouldBeStatic', null, sprintf('Method "%s::getMethodShouldBeStatic()" should be static.', FooTaggedForInvalidDefaultMethodClass::class)];`
`188`	`188`	`yield ['getMethodShouldBeStatic', 'foo', sprintf('Either method "%s::getMethodShouldBeStatic()" should be static or tag "my_custom_tag" on service "service1" is missing attribute "foo".', FooTaggedForInvalidDefaultMethodClass::class)];`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testResolveClassFromId($serviceId)`
`33`	`33`	`$this->assertSame($serviceId, $def->getClass());`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function provideValidClassId()`
	`36`	`+ public static function provideValidClassId()`
`37`	`37`	`{`
`38`	`38`	`yield ['Acme\UnknownClass'];`
`39`	`39`	`yield [CaseSensitiveClass::class];`
`@@ -52,7 +52,7 @@ public function testWontResolveClassFromId($serviceId)`
`52`	`52`	`$this->assertNull($def->getClass());`
`53`	`53`	`}`
`54`	`54`
`55`		`- public function provideInvalidClassId()`
	`55`	`+ public static function provideInvalidClassId()`
`56`	`56`	`{`
`57`	`57`	`yield [\stdClass::class];`
`58`	`58`	`yield ['bar'];`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testInlinedDefinitionFactoryIsProcessed()`
`46`	`46`	`$this->assertSame(['Baz\Qux', 'getInstance'], $factory->getFactory()[0]->getFactory());`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function provideFulfilledFactories()`
	`49`	`+ public static function provideFulfilledFactories()`
`50`	`50`	`{`
`51`	`51`	`return [`
`52`	`52`	`[['Foo\Bar', 'create']],`