[Tests] Streamline

Author: OskarStark

Tests/DataCollector/SecurityDataCollectorTest.php

@@ -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

Tests/DependencyInjection/SecurityExtensionTest.php

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

Tests/Functional/AuthenticatorTest.php

@@ -60,7 +60,7 @@ public function testWithoutUserProvider($email)
         $this->assertJsonStringEqualsJsonString('{"email":"'.$email.'"}', $client->getResponse()->getContent());
     }
 
-    public static function provideEmails()
+    public static function provideEmails(): iterable
     {
         yield ['[email protected]', true];
         yield ['[email protected]', false];
@@ -84,7 +84,7 @@ public function testLoginUsersWithMultipleFirewalls(string $username, string $fi
         $this->assertEquals('Welcome '.$username.'!', $client->getResponse()->getContent());
     }
 
-    public static function provideEmailsWithFirewalls()
+    public static function provideEmailsWithFirewalls(): iterable
     {
         yield ['[email protected]', 'main'];
         yield ['[email protected]', 'custom'];

Tests/Functional/CsrfFormLoginTest.php

@@ -217,7 +217,7 @@ public function testLegacyFormLoginRedirectsToProtectedResourceAfterLogin($optio
         $this->assertStringContainsString('You\'re browsing to path "/protected-resource".', $text);
     }
 
-    public static function provideClientOptions()
+    public static function provideClientOptions(): iterable
     {
         yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'config.yml', 'enable_authenticator_manager' => true]];
         yield [['test_case' => 'CsrfFormLogin', 'root_config' => 'routes_as_path.yml', 'enable_authenticator_manager' => true]];

Tests/Functional/FormLoginTest.php

@@ -300,7 +300,7 @@ public function testLegacyLoginThrottling()
         }
     }
 
-    public static function provideClientOptions()
+    public static function provideClientOptions(): iterable
     {
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml', 'enable_authenticator_manager' => true]];
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml', 'enable_authenticator_manager' => true]];

Tests/Functional/RememberMeTest.php

@@ -175,7 +175,7 @@ public function testLegacySessionLessRememberMeLogout()
         $this->assertNull($cookieJar->get('REMEMBERME'));
     }
 
-    public static function provideConfigs()
+    public static function provideConfigs(): iterable
     {
         yield [['root_config' => 'config_session.yml']];
         yield [['root_config' => 'config_persistent.yml']];

Tests/Functional/SecurityRoutingIntegrationTest.php

@@ -125,8 +125,7 @@ public function testInvalidIpsInAccessControl()
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('The given value "256.357.458.559" in the "security.access_control" config option is not a valid IP address.');
 
-        $client = $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'invalid_ip_access_control.yml']);
-        $client->request('GET', '/unprotected_resource');
+        $this->createClient(['test_case' => 'StandardFormLogin', 'root_config' => 'invalid_ip_access_control.yml']);
     }
 
     public function testPublicHomepage()
@@ -295,7 +294,7 @@ private function assertRestricted($client, $path)
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
     }
 
-    public static function provideClientOptions()
+    public static function provideClientOptions(): iterable
     {
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml', 'enable_authenticator_manager' => true]];
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml', 'enable_authenticator_manager' => true]];
@@ -307,7 +306,7 @@ public static function provideLegacyClientOptions()
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml', 'enable_authenticator_manager' => true]];
     }
 
-    public static function provideConfigs()
+    public static function provideConfigs(): iterable
     {
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'base_config.yml']];
         yield [['test_case' => 'StandardFormLogin', 'root_config' => 'routes_as_path.yml']];

Tests/Functional/SecurityTest.php

@@ -114,7 +114,7 @@ public function testLegacyServiceIsFunctional()
         $this->assertSame($token, $security->getToken());
     }
 
-    public static function userWillBeMarkedAsChangedIfRolesHasChangedProvider()
+    public static function userWillBeMarkedAsChangedIfRolesHasChangedProvider(): array
     {
         return [
             [