Use static data providers

Refs #48281
symfony · OskarStark · Nov 22, 2022 · Nov 22, 2022 · Nov 22, 2022 · Nov 22, 2022
commit 006f60e24ce742bcf5312cd9192657cd47c5cdd8
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -182,7 +182,7 @@ public function testSerialization($param, array $types, $expected, $explainable,
         $this->assertSame($runnable, $collectedQueries['default'][0]['runnable']);
     }
 
-    public function paramProvider(): array
+    public static function paramProvider(): array
     {
         return [
             ['some value', [], 'some value', true],

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -170,7 +170,7 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
         ], $expectedEm2));
     }
 
-    public function providerBasicDrivers()
+    public static function providerBasicDrivers()
     {
         return [
             ['doctrine.orm.cache.apc.class',       ['type' => 'apc']],

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
@@ -169,7 +169,7 @@ public function testEmbeddedIdentifierName()
         $loader->getEntitiesByIds('id.value', [1, '', 2, 3, 'foo']);
     }
 
-    public function provideGuidEntityClasses()
+    public static function provideGuidEntityClasses()
     {
         return [
             ['Symfony\Bridge\Doctrine\Tests\Fixtures\GuidIdEntity'],

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/DoctrineOrmTypeGuesserTest.php
@@ -29,7 +29,7 @@ public function testRequiredGuesser($classMetadata, $expected)
         $this->assertEquals($expected, $this->getGuesser($classMetadata)->guessRequired('TestEntity', 'field'));
     }
 
-    public function requiredProvider()
+    public static function requiredProvider()
     {
         $return = [];
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -158,7 +158,7 @@ public function testChoiceTranslationDomainIsDisabledByDefault($expanded)
         }
     }
 
-    public function choiceTranslationDomainProvider()
+    public static function choiceTranslationDomainProvider()
     {
         return [
             [false],

diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -190,7 +190,7 @@ public function testExtractEnum()
         $this->assertNull($this->createExtractor()->getTypes(DoctrineEnum::class, 'enumCustom', []));
     }
 
-    public function typesProvider()
+    public static function typesProvider()
     {
         $provider = [
             ['id', [new Type(Type::BUILTIN_TYPE_INT)]],

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -435,7 +435,7 @@ public function testValidateResultTypes($entity1, $result)
         $this->assertNoViolation();
     }
 
-    public function resultTypesProvider()
+    public static function resultTypesProvider()
     {
         $entity = new SingleIntIdEntity(1, 'foo');
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php
@@ -208,7 +208,7 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp
         $this->assertSame($expected, $doctrineLoader->loadClassMetadata($classMetadata));
     }
 
-    public function regexpProvider()
+    public static function regexpProvider()
     {
         return [
             [false, null],

diff --git a/src/Symfony/Bridge/Monolog/Tests/Formatter/ConsoleFormatterTest.php b/src/Symfony/Bridge/Monolog/Tests/Formatter/ConsoleFormatterTest.php
@@ -26,7 +26,7 @@ public function testFormat(array $record, $expectedMessage)
         self::assertSame($expectedMessage, $formatter->format($record));
     }
 
-    public function providerFormatTests(): array
+    public static function providerFormatTests(): array
     {
         $currentDateTime = new \DateTime();
 

diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php
@@ -89,7 +89,7 @@ public function testVerbosityMapping($verbosity, $level, $isHandling, array $map
         $this->assertFalse($handler->handle($infoRecord), 'The handler finished handling the log.');
     }
 
-    public function provideVerbosityMappingTests()
+    public static function provideVerbosityMappingTests()
     {
         return [
             [OutputInterface::VERBOSITY_QUIET, Logger::ERROR, true],

diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/HttpCodeActivationStrategyTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/HttpCodeActivationStrategyTest.php
@@ -54,7 +54,7 @@ public function testIsActivated($url, $record, $expected)
         $this->assertEquals($expected, $strategy->isHandlerActivated($record));
     }
 
-    public function isActivatedProvider()
+    public static function isActivatedProvider()
     {
         return [
             ['/test',  ['level' => Logger::ERROR], true],

diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/FingersCrossed/NotFoundActivationStrategyTest.php
@@ -33,7 +33,7 @@ public function testIsActivated($url, $record, $expected)
         $this->assertEquals($expected, $strategy->isHandlerActivated($record));
     }
 
-    public function isActivatedProvider()
+    public static function isActivatedProvider()
     {
         return [
             ['/test',      ['level' => Logger::DEBUG], false],

diff --git a/src/Symfony/Bridge/Monolog/Tests/Processor/DebugProcessorTest.php b/src/Symfony/Bridge/Monolog/Tests/Processor/DebugProcessorTest.php
@@ -32,7 +32,7 @@ public function testDatetimeFormat(array $record, $expectedTimestamp)
         self::assertSame($expectedTimestamp, $records[0]['timestamp']);
     }
 
-    public function providerDatetimeFormatTests(): array
+    public static function providerDatetimeFormatTests(): array
     {
         $record = $this->getRecord();
 

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -97,7 +97,7 @@ public function testItMutesOnlySpecificErrorMessagesWhenTheCallingCodeIsInPhpuni
         $this->assertSame($muted, $deprecation->isMuted());
     }
 
-    public function mutedProvider()
+    public static function mutedProvider()
     {
         yield 'not from phpunit, and not a whitelisted message' => [
             false,
@@ -147,7 +147,7 @@ public function testItTakesMutesDeprecationFromPhpUnitFiles()
         $this->assertTrue($deprecation->isMuted());
     }
 
-    public function providerGetTypeDetectsSelf()
+    public static function providerGetTypeDetectsSelf()
     {
         return [
             'not_from_vendors_file' => [Deprecation::TYPE_SELF, '', 'MyClass1', __FILE__],
@@ -182,7 +182,7 @@ public function testGetTypeDetectsSelf(string $expectedType, string $message, st
         $this->assertSame($expectedType, $deprecation->getType());
     }
 
-    public function providerGetTypeUsesRightTrace()
+    public static function providerGetTypeUsesRightTrace()
     {
         $vendorDir = self::getVendorDir();
         $fakeTrace = [

diff --git a/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php b/src/Symfony/Bridge/Twig/Tests/AppVariableTest.php
@@ -43,7 +43,7 @@ public function testDebug($debugFlag)
         $this->assertEquals($debugFlag, $this->appVariable->getDebug());
     }
 
-    public function debugDataProvider()
+    public static function debugDataProvider()
     {
         return [
             'debug on' => [true],

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php
@@ -44,15 +44,15 @@ public function testGettingMethodAbbreviation($method, $abbr)
         $this->assertEquals($this->getExtension()->abbrMethod($method), $abbr);
     }
 
-    public function getClassNameProvider()
+    public static function getClassNameProvider()
     {
         return [
             ['F\Q\N\Foo', '<abbr title="F\Q\N\Foo">Foo</abbr>'],
             ['Bare', '<abbr title="Bare">Bare</abbr>'],
         ];
     }
 
-    public function getMethodNameProvider()
+    public static function getMethodNameProvider()
     {
         return [
             ['F\Q\N\Foo::Method', '<abbr title="F\Q\N\Foo">Foo</abbr>::Method()'],

@@ -100,7 +100,7 @@ public function testThemeBlockInheritanceUsingDynamicExtend()
         );
     }
 
-    public function isSelectedChoiceProvider()
+    public static function isSelectedChoiceProvider()
     {
         return [
             [true, '0', '0'],
@@ -150,7 +150,7 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
         $this->assertSame('<form name="form" method="get" action="0">', $html);
     }
 
-    public function isRootFormProvider()
+    public static function isRootFormProvider()
     {
         return [
             [true, new FormView()],

diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -112,7 +112,7 @@ public function testExtractSyntaxError($resources, array $messages)
         $this->assertSame($messages, $catalogue->all());
     }
 
-    public function resourcesWithSyntaxErrorsProvider(): array
+    public static function resourcesWithSyntaxErrorsProvider(): array
     {
         return [
             [__DIR__.'/../Fixtures', ['messages' => ['Hi!' => 'Hi!']]],
@@ -143,7 +143,7 @@ public function testExtractWithFiles($resource)
         $this->assertEquals('Hi!', $catalogue->get('Hi!', 'messages'));
     }
 
-    public function resourceProvider(): array
+    public static function resourceProvider(): array
     {
         $directory = __DIR__.'/../Fixtures/extractor/';
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -103,7 +103,7 @@ public function testRoute($permanent, $keepRequestMethod, $keepQueryParams, $ign
         $this->assertEquals($expectedCode, $returnResponse->getStatusCode());
     }
 
-    public function provider()
+    public static function provider()
     {
         return [
             [true, false, false, false, 301, ['additional-parameter' => 'value']],
@@ -210,7 +210,7 @@ public function testUrlRedirectDefaultPorts()
         $this->assertRedirectUrl($returnValue, $expectedUrl);
     }
 
-    public function urlRedirectProvider()
+    public static function urlRedirectProvider()
     {
         return [
             // Standard ports
@@ -262,7 +262,7 @@ public function testUrlRedirect($scheme, $httpPort, $httpsPort, $requestScheme,
         $this->assertRedirectUrl($returnValue, $expectedUrl);
     }
 
-    public function pathQueryParamsProvider()
+    public static function pathQueryParamsProvider()
     {
         return [
             ['http://www.example.com/base/redirect-path', '/redirect-path',  ''],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -126,7 +126,7 @@ public function testValidAssetsPackageNameConfiguration($packageName)
         $this->assertArrayHasKey($packageName, $config['assets']['packages']);
     }
 
-    public function provideValidAssetsPackageNameConfigurationTests()
+    public static function provideValidAssetsPackageNameConfigurationTests()
     {
         return [
             ['foobar'],
@@ -152,7 +152,7 @@ public function testInvalidAssetsConfiguration(array $assetConfig, $expectedMess
             ]);
     }
 
-    public function provideInvalidAssetConfigurationTests()
+    public static function provideInvalidAssetConfigurationTests()
     {
         // helper to turn config into embedded package config
         $createPackageConfig = function (array $packageConfig) {
@@ -205,7 +205,7 @@ public function testValidLockConfiguration($lockConfig, $processedConfig)
         $this->assertEquals($processedConfig, $config['lock']);
     }
 
-    public function provideValidLockConfigurationTests()
+    public static function provideValidLockConfigurationTests()
     {
         yield [null, ['enabled' => true, 'resources' => ['default' => [class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphore' : 'flock']]]];
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1468,7 +1468,7 @@ public function testEventDispatcherService()
         $this->assertInstanceOf(EventDispatcherInterface::class, $container->get('foo')->dispatcher);
     }
 
-    public function testCacheDefaultRedisProvider()
+    public static function testCacheDefaultRedisProvider()
     {
         $container = $this->createContainerFromFile('cache');
 
@@ -1672,7 +1672,7 @@ public function testHttpClientFullDefaultOptions()
         ], $defaultOptions['peer_fingerprint']);
     }
 
-    public function provideMailer(): array
+    public static function provideMailer(): array
     {
         return [
             ['mailer_with_dsn', ['main' => 'smtp://example.com']],

diff --git a/...ymfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php b/...ymfony/Bundle/FrameworkBundle/Tests/EventListener/ResolveControllerNameSubscriberTest.php
@@ -63,7 +63,7 @@ public function testSkipsOtherControllerFormats($controller)
         $this->assertEquals($controller, $request->attributes->get('_controller'));
     }
 
-    public function provideSkippedControllers()
+    public static function provideSkippedControllers()
     {
         yield ['Other:format'];
         yield [function () {}];

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -136,7 +136,7 @@ public function testDescribeEnvVar()
         $this->assertStringContainsString(file_get_contents(__DIR__.'/Fixtures/describe_env_vars.txt'), $tester->getDisplay(true));
     }
 
-    public function provideIgnoreBackslashWhenFindingService()
+    public static function provideIgnoreBackslashWhenFindingService()
     {
         return [
             [BackslashClass::class],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/GlobalVariablesTest.php
@@ -93,7 +93,7 @@ public function testGetUser($user, $expectedUser)
         $this->assertSame($expectedUser, $this->globals->getUser());
     }
 
-    public function getUserProvider()
+    public static function getUserProvider()
     {
         $user = $this->createMock(UserInterface::class);
         $std = new \stdClass();

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateFilenameParserTest.php
@@ -46,7 +46,7 @@ public function testParseFromFilename($file, $ref)
         }
     }
 
-    public function getFilenameToTemplateProvider()
+    public static function getFilenameToTemplateProvider()
     {
         return [
             ['/path/to/section/name.format.engine', new TemplateReference('', '/path/to/section', 'name', 'format', 'engine')],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php
@@ -58,7 +58,7 @@ public function testParse($name, $logicalName, $path, $ref)
         $this->assertSame($path, $template->getPath());
     }
 
-    public function parseProvider()
+    public static function parseProvider()
     {
         return [
             ['FooBundle:Post:index.html.php', 'FooBundle:Post:index.html.php', '@FooBundle/Resources/views/Post/index.html.php', new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php')],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateTest.php
@@ -27,7 +27,7 @@ public function testGetPathForTemplate($template, $path)
         $this->assertSame($template->getPath(), $path);
     }
 
-    public function getTemplateToPathProvider()
+    public static function getTemplateToPathProvider()
     {
         return [
             [new TemplateReference('FooBundle', 'Post', 'index', 'html', 'php'), '@FooBundle/Resources/views/Post/index.html.php'],

diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallConfig.php
@@ -74,7 +74,7 @@ public function isStateless(): bool
         return $this->stateless;
     }
 
-    public function getProvider(): ?string
+    public static function getProvider(): ?string
     {
         return $this->provider;
     }

@@ -251,7 +251,7 @@ public function testGetListeners()
         $this->assertSame(1, $listenerCalled);
     }
 
-    public function providerCollectDecisionLog(): \Generator
+    public static function providerCollectDecisionLog(): \Generator
     {
         $voter1 = $this->getMockBuilder(VoterInterface::class)->getMockForAbstractClass();
         $voter2 = $this->getMockBuilder(VoterInterface::class)->getMockForAbstractClass();
@@ -381,7 +381,7 @@ public function testCollectDecisionLog(string $strategy, array $decisionLog, arr
         $this->assertSame($dataCollector->getVoterStrategy(), $strategy, 'Wrong value returned by getVoterStrategy');
     }
 
-    public function provideRoles()
+    public static function provideRoles()
     {
         return [
             // Basic roles

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -627,27 +627,27 @@ public function testAccessDecisionManagerOptionsAreNotOverriddenByImplicitStrate
         $this->assertFalse($accessDecisionManagerDefinition->getArgument(3));
     }
 
-    public function testFirewallUndefinedUserProvider()
+    public static function testFirewallUndefinedUserProvider()
     {
         $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');
         $this->getContainer('firewall_undefined_provider');
     }
 
-    public function testFirewallListenerUndefinedProvider()
+    public static function testFirewallListenerUndefinedProvider()
     {
         $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessage('Invalid firewall "main": user provider "undefined" not found.');
         $this->getContainer('listener_undefined_provider');
     }
 
-    public function testFirewallWithUserProvider()
+    public static function testFirewallWithUserProvider()
     {
         $this->getContainer('firewall_provider');
         $this->addToAssertionCount(1);
     }
 
-    public function testFirewallListenerWithProvider()
+    public static function testFirewallListenerWithProvider()
     {
         $this->getContainer('listener_provider');
         $this->addToAssertionCount(1);