symfony · nicolas-grekas · Oct 31, 2023 · Oct 30, 2023 · OskarStark · Oct 30, 2023
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -197,7 +197,7 @@ public function testMappingTypeDetection()
         $this->assertSame($mappingType, \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute');
     }
 
-    public static function providerBasicDrivers()
+    public static function providerBasicDrivers(): array
     {
         return [
             ['doctrine.orm.cache.apc.class',       ['type' => 'apc']],
@@ -276,7 +276,7 @@ public function testUnrecognizedCacheDriverException()
         $this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
     }
 
-    public static function providerBundles()
+    public static function providerBundles(): iterable
     {
         yield ['AnnotationsBundle', \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute', '/Entity'];
         yield ['AnnotationsOneLineBundle', \PHP_VERSION_ID < 80000 ? 'annotation' : 'attribute', '/Entity'];

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 static function choiceTranslationDomainProvider()
+    public static function choiceTranslationDomainProvider(): array
     {
         return [
             [false],
@@ -240,8 +240,6 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
                 return new \stdClass();
             },
         ]);
-
-        $field->submit('2');
     }
 
     public function testConfigureQueryBuilderWithClosureReturningNullUseDefault()

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

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 static function provideVerbosityMappingTests()
+    public static function provideVerbosityMappingTests(): array
     {
         return [
             [OutputInterface::VERBOSITY_QUIET, Logger::ERROR, true],

diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ConfigurationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/ConfigurationTest.php
@@ -249,8 +249,8 @@ public function testToleratesForIndividualGroups(string $deprecationsHelper, arr
         }
     }
 
-    public static function provideDataForToleratesForGroup() {
-
+    public static function provideDataForToleratesForGroup(): iterable
+    {
         yield 'total threshold not reached' => ['max[total]=1', [
             'unsilenced' => 0,
             'self' => 0,

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 static function mutedProvider()
+    public static function mutedProvider(): iterable
     {
         yield 'not from phpunit, and not a whitelisted message' => [
             false,
@@ -147,7 +147,7 @@ public function testItTakesMutesDeprecationFromPhpUnitFiles()
         $this->assertTrue($deprecation->isMuted());
     }
 
-    public static function providerGetTypeDetectsSelf()
+    public static function providerGetTypeDetectsSelf(): array
     {
         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 static function providerGetTypeUsesRightTrace()
+    public static function providerGetTypeUsesRightTrace(): array
     {
         $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 static function debugDataProvider()
+    public static function debugDataProvider(): array
     {
         return [
             'debug on' => [true],

diff --git a/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php
@@ -150,7 +150,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $tester->complete($input));
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'option' => [['--format', ''], ['txt', 'json', 'github']];
     }

@@ -100,7 +100,7 @@ public function testThemeBlockInheritanceUsingDynamicExtend()
         );
     }
 
-    public static function isSelectedChoiceProvider()
+    public static function isSelectedChoiceProvider(): array
     {
         return [
             [true, '0', '0'],
@@ -150,7 +150,7 @@ public function testStartTagHasActionAttributeWhenActionIsZero()
         $this->assertSame('<form name="form" method="get" action="0">', $html);
     }
 
-    public static function isRootFormProvider()
+    public static function isRootFormProvider(): array
     {
         return [
             [true, new FormView()],
@@ -381,14 +381,14 @@ protected function setTheme(FormView $view, array $themes, $useDefaultThemes = t
         $this->renderer->setTheme($view, $themes, $useDefaultThemes);
     }
 
-    public static function themeBlockInheritanceProvider()
+    public static function themeBlockInheritanceProvider(): array
     {
         return [
             [['theme.html.twig']],
         ];
     }
 
-    public static function themeInheritanceProvider()
+    public static function themeInheritanceProvider(): array
     {
         return [
             [['parent_label.html.twig'], ['child_label.html.twig']],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/SerializerCacheWarmerTest.php
@@ -40,7 +40,7 @@ public function testWarmUp(array $loaders)
         $this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());
     }
 
-    public static function loaderProvider()
+    public static function loaderProvider(): array
     {
         return [
             [

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePoolClearCommandTest.php
@@ -44,7 +44,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $suggestions);
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'pool_name' => [
             ['f'],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePoolDeleteCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePoolDeleteCommandTest.php
@@ -98,7 +98,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $suggestions);
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'pool_name' => [
             ['f'],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php
@@ -31,7 +31,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $suggestions);
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'event' => [[''], ['Symfony\Component\Mailer\Event\MessageEvent', 'console.command']];
         yield 'event for other dispatcher' => [['--dispatcher', 'other_event_dispatcher', ''], ['other_event', 'App\OtherEvent']];

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/SecretsRemoveCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/SecretsRemoveCommandTest.php
@@ -37,7 +37,7 @@ public function testComplete(bool $withLocalVault, array $input, array $expected
         $this->assertSame($expectedSuggestions, $suggestions);
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'name' => [true, [''], ['SECRET', 'OTHER_SECRET']];
         yield '--local name (with local vault)' => [true, ['--local', ''], ['SECRET']];

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/SecretsSetCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/SecretsSetCommandTest.php
@@ -32,7 +32,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $suggestions);
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'name' => [[''], ['SECRET', 'OTHER_SECRET']];
         yield '--local name (with local vault)' => [['--local', ''], ['SECRET', 'OTHER_SECRET']];

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
@@ -269,7 +269,7 @@ function ($path, $catalogue) use ($extractedMessagesWithDomains) {
         $this->assertSame($expectedSuggestions, $suggestions);
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'locale' => [
             [''],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php
@@ -42,7 +42,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $suggestions);
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         $bundle = new ExtensionPresentBundle();
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
@@ -409,7 +409,7 @@ public function testdenyAccessUnlessGrantedSetsAttributesAsArray($attribute, $ex
         }
     }
 
-    public static function provideDenyAccessUnlessGrantedSetsAttributesAsArray()
+    public static function provideDenyAccessUnlessGrantedSetsAttributesAsArray(): array
     {
         $obj = new \stdClass();
         $obj->foo = 'bar';

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 static function provider()
+    public static function provider(): array
     {
         return [
             [true, false, false, false, 301, ['additional-parameter' => 'value']],
@@ -210,7 +210,7 @@ public function testUrlRedirectDefaultPorts()
         $this->assertRedirectUrl($returnValue, $expectedUrl);
     }
 
-    public static function urlRedirectProvider()
+    public static function urlRedirectProvider(): array
     {
         return [
             // Standard ports
@@ -262,7 +262,7 @@ public function testUrlRedirect($scheme, $httpPort, $httpsPort, $requestScheme,
         $this->assertRedirectUrl($returnValue, $expectedUrl);
     }
 
-    public static function pathQueryParamsProvider()
+    public static function pathQueryParamsProvider(): array
     {
         return [
             ['http://www.example.com/base/redirect-path', '/redirect-path',  ''],

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TemplateControllerTest.php
@@ -32,13 +32,23 @@ public function testTwig()
         $this->assertEquals('bar', $controller('mytemplate')->getContent());
     }
 
-    public function testNoTwig()
+    public function testNoTwigTemplateActionMethod()
     {
+        $controller = new TemplateController();
+
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('You cannot use the TemplateController if the Twig Bundle is not available.');
-        $controller = new TemplateController();
 
         $controller->templateAction('mytemplate')->getContent();
+    }
+
+    public function testNoTwigInvokeMethod()
+    {
+        $controller = new TemplateController();
+
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('You cannot use the TemplateController if the Twig Bundle is not available.');
+
         $controller('mytemplate')->getContent();
     }
 

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

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -204,7 +204,7 @@ public function testGetDeprecationNoFile()
         $this->assertStringContainsString('[WARNING] The deprecation file does not exist', $tester->getDisplay());
     }
 
-    public static function provideIgnoreBackslashWhenFindingService()
+    public static function provideIgnoreBackslashWhenFindingService(): array
     {
         return [
             [BackslashClass::class],
@@ -232,7 +232,7 @@ public function testComplete(array $input, array $expectedSuggestions, array $no
         }
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         $serviceId = 'console.command.container_debug';
         $hiddenServiceId = '.console.command.container_debug.lazy';

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/RouterDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/RouterDebugCommandTest.php
@@ -100,7 +100,7 @@ public function testComplete(array $input, array $expectedSuggestions)
         $this->assertSame($expectedSuggestions, $tester->complete($input));
     }
 
-    public static function provideCompletionSuggestions()
+    public static function provideCompletionSuggestions(): iterable
     {
         yield 'option --format' => [
             ['--format', ''],

@@ -400,7 +400,7 @@ public function dispatch(object $event, string $eventName = null): object
         $this->assertSame($dataCollector->getVoterStrategy(), $strategy, 'Wrong value returned by getVoterStrategy');
     }
 
-    public static function provideRoles()
+    public static function provideRoles(): array
     {
         return [
             // Basic roles

@@ -526,7 +526,7 @@ public function testSecretRememberMeHandler()
         $this->assertSame('very', $handler->getArgument(1));
     }
 
-    public static function sessionConfigurationProvider()
+    public static function sessionConfigurationProvider(): array
     {
         return [
             [
@@ -659,7 +659,7 @@ public function testAuthenticatorManagerEnabledEntryPoint(array $firewall, $entr
         $this->assertEquals($entryPointId, (string) $container->getDefinition('security.exception_listener.main')->getArgument(4));
     }
 
-    public static function provideEntryPointFirewalls()
+    public static function provideEntryPointFirewalls(): iterable
     {
         // only one entry point available
         yield [['http_basic' => true], 'security.authenticator.http_basic.main'];
@@ -679,7 +679,7 @@ public static function provideEntryPointFirewalls()
     /**
      * @dataProvider provideEntryPointRequiredData
      */
-    public function testEntryPointRequired(array $firewall, $messageRegex)
+    public function testEntryPointRequired(array $firewall, string $messageRegex)
     {
         $this->expectException(InvalidConfigurationException::class);
         $this->expectExceptionMessageMatches($messageRegex);
@@ -699,7 +699,7 @@ public function testEntryPointRequired(array $firewall, $messageRegex)
         $container->compile();
     }
 
-    public static function provideEntryPointRequiredData()
+    public static function provideEntryPointRequiredData(): iterable
     {
         // more than one entry point available and not explicitly set
         yield [
@@ -749,7 +749,7 @@ public function testConfigureCustomAuthenticator(array $firewall, array $expecte
         $this->assertEquals($expectedAuthenticators, array_map('strval', $container->getDefinition('security.authenticator.manager.main')->getArgument(0)));
     }
 
-    public static function provideConfigureCustomAuthenticatorData()
+    public static function provideConfigureCustomAuthenticatorData(): iterable
     {
         yield [
             ['custom_authenticator' => TestAuthenticator::class],
@@ -829,7 +829,7 @@ public function testUserCheckerWithAuthenticatorManager(array $config, string $e
         $this->assertEquals($expectedUserCheckerClass, $container->findDefinition($userCheckerId)->getClass());
     }
 
-    public static function provideUserCheckerConfig()
+    public static function provideUserCheckerConfig(): iterable
     {
         yield [[], InMemoryUserChecker::class];
         yield [['user_checker' => TestUserChecker::class], TestUserChecker::class];