[Tests] Streamline

OskarStark · nicolas-grekas · commit 4eeac66c8b0f · 2023-10-31T08:58:33.000+01:00
diff --git a/Tests/CacheWarmer/SerializerCacheWarmerTest.php b/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/Tests/Command/CachePoolClearCommandTest.php b/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/Tests/Command/CachePoolDeleteCommandTest.php b/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/Tests/Command/EventDispatcherDebugCommandTest.php b/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/Tests/Command/SecretsRemoveCommandTest.php b/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/Tests/Command/SecretsSetCommandTest.php b/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/Tests/Command/TranslationDebugCommandTest.php b/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/Tests/Command/TranslationUpdateCommandCompletionTest.php b/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/Tests/Controller/AbstractControllerTest.php b/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/Tests/Controller/RedirectControllerTest.php b/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/Tests/Controller/TemplateControllerTest.php b/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/Tests/DependencyInjection/ConfigurationTest.php b/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/Tests/Functional/ContainerDebugCommandTest.php b/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/Tests/Functional/RouterDebugCommandTest.php b/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', ''],

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function testWarmUp(array $loaders)`
`40`	`40`	`$this->assertTrue($arrayPool->getItem('Symfony_Bundle_FrameworkBundle_Tests_Fixtures_Serialization_Author')->isHit());`
`41`	`41`	`}`
`42`	`42`
`43`		`- public static function loaderProvider()`
	`43`	`+ public static function loaderProvider(): array`
`44`	`44`	`{`
`45`	`45`	`return [`
`46`	`46`	`[`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function testComplete(array $input, array $expectedSuggestions)`
`44`	`44`	`$this->assertSame($expectedSuggestions, $suggestions);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public static function provideCompletionSuggestions()`
	`47`	`+ public static function provideCompletionSuggestions(): iterable`
`48`	`48`	`{`
`49`	`49`	`yield 'pool_name' => [`
`50`	`50`	`['f'],`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function testComplete(array $input, array $expectedSuggestions)`
`98`	`98`	`$this->assertSame($expectedSuggestions, $suggestions);`
`99`	`99`	`}`
`100`	`100`
`101`		`- public static function provideCompletionSuggestions()`
	`101`	`+ public static function provideCompletionSuggestions(): iterable`
`102`	`102`	`{`
`103`	`103`	`yield 'pool_name' => [`
`104`	`104`	`['f'],`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function testComplete(array $input, array $expectedSuggestions)`
`31`	`31`	`$this->assertSame($expectedSuggestions, $suggestions);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static function provideCompletionSuggestions()`
	`34`	`+ public static function provideCompletionSuggestions(): iterable`
`35`	`35`	`{`
`36`	`36`	`yield 'event' => [[''], ['Symfony\Component\Mailer\Event\MessageEvent', 'console.command']];`
`37`	`37`	`yield 'event for other dispatcher' => [['--dispatcher', 'other_event_dispatcher', ''], ['other_event', 'App\OtherEvent']];`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function testComplete(bool $withLocalVault, array $input, array $expected`
`37`	`37`	`$this->assertSame($expectedSuggestions, $suggestions);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public static function provideCompletionSuggestions()`
	`40`	`+ public static function provideCompletionSuggestions(): iterable`
`41`	`41`	`{`
`42`	`42`	`yield 'name' => [true, [''], ['SECRET', 'OTHER_SECRET']];`
`43`	`43`	`yield '--local name (with local vault)' => [true, ['--local', ''], ['SECRET']];`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testComplete(array $input, array $expectedSuggestions)`
`32`	`32`	`$this->assertSame($expectedSuggestions, $suggestions);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public static function provideCompletionSuggestions()`
	`35`	`+ public static function provideCompletionSuggestions(): iterable`
`36`	`36`	`{`
`37`	`37`	`yield 'name' => [[''], ['SECRET', 'OTHER_SECRET']];`
`38`	`38`	`yield '--local name (with local vault)' => [['--local', ''], ['SECRET', 'OTHER_SECRET']];`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ function ($path, $catalogue) use ($extractedMessagesWithDomains) {`
`269`	`269`	`$this->assertSame($expectedSuggestions, $suggestions);`
`270`	`270`	`}`
`271`	`271`
`272`		`- public static function provideCompletionSuggestions()`
	`272`	`+ public static function provideCompletionSuggestions(): iterable`
`273`	`273`	`{`
`274`	`274`	`yield 'locale' => [`
`275`	`275`	`[''],`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testComplete(array $input, array $expectedSuggestions)`
`42`	`42`	`$this->assertSame($expectedSuggestions, $suggestions);`
`43`	`43`	`}`
`44`	`44`
`45`		`- public static function provideCompletionSuggestions()`
	`45`	`+ public static function provideCompletionSuggestions(): iterable`
`46`	`46`	`{`
`47`	`47`	`$bundle = new ExtensionPresentBundle();`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ public function testdenyAccessUnlessGrantedSetsAttributesAsArray($attribute, $ex`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`
`412`		`- public static function provideDenyAccessUnlessGrantedSetsAttributesAsArray()`
	`412`	`+ public static function provideDenyAccessUnlessGrantedSetsAttributesAsArray(): array`
`413`	`413`	`{`
`414`	`414`	`$obj = new \stdClass();`
`415`	`415`	`$obj->foo = 'bar';`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function testRoute($permanent, $keepRequestMethod, $keepQueryParams, $ign`
`103`	`103`	`$this->assertEquals($expectedCode, $returnResponse->getStatusCode());`
`104`	`104`	`}`
`105`	`105`
`106`		`- public static function provider()`
	`106`	`+ public static function provider(): array`
`107`	`107`	`{`
`108`	`108`	`return [`
`109`	`109`	`[true, false, false, false, 301, ['additional-parameter' => 'value']],`
`@@ -210,7 +210,7 @@ public function testUrlRedirectDefaultPorts()`
`210`	`210`	`$this->assertRedirectUrl($returnValue, $expectedUrl);`
`211`	`211`	`}`
`212`	`212`
`213`		`- public static function urlRedirectProvider()`
	`213`	`+ public static function urlRedirectProvider(): array`
`214`	`214`	`{`
`215`	`215`	`return [`
`216`	`216`	`// Standard ports`
`@@ -262,7 +262,7 @@ public function testUrlRedirect($scheme, $httpPort, $httpsPort, $requestScheme,`
`262`	`262`	`$this->assertRedirectUrl($returnValue, $expectedUrl);`
`263`	`263`	`}`
`264`	`264`
`265`		`- public static function pathQueryParamsProvider()`
	`265`	`+ public static function pathQueryParamsProvider(): array`
`266`	`266`	`{`
`267`	`267`	`return [`
`268`	`268`	`['http://www.example.com/base/redirect-path', '/redirect-path', ''],`