Merge branch '6.4' into 7.0

* 6.4:
  fix typo
  remove the WriteConfig class
  DX: PHP CS Fixer - keep Annotation,NamedArgumentConstructor,Target annotations as single group
  do not install FrameworkBundle 6.4
  [Tests] Add `array` return type for provider methods
  [Tests] Move expectException closer to the place of the expectation to avoid false positives

Author: xabbuh

Tests/DependencyInjection/Compiler/AddSecurityVotersPassTest.php

@@ -24,15 +24,17 @@ class AddSecurityVotersPassTest extends TestCase
 {
     public function testNoVoters()
     {
-        $this->expectException(LogicException::class);
-        $this->expectExceptionMessage('No security voters found. You need to tag at least one with "security.voter".');
         $container = new ContainerBuilder();
         $container
             ->register('security.access.decision_manager', AccessDecisionManager::class)
             ->addArgument([])
         ;
 
         $compilerPass = new AddSecurityVotersPass();
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('No security voters found. You need to tag at least one with "security.voter".');
+
         $compilerPass->process($container);
     }
 

Tests/DependencyInjection/MainConfigurationTest.php

@@ -36,7 +36,6 @@ class MainConfigurationTest extends TestCase
 
     public function testNoConfigForProvider()
     {
-        $this->expectException(InvalidConfigurationException::class);
         $config = [
             'providers' => [
                 'stub' => [],
@@ -45,12 +44,14 @@ public function testNoConfigForProvider()
 
         $processor = new Processor();
         $configuration = new MainConfiguration([], []);
+
+        $this->expectException(InvalidConfigurationException::class);
+
         $processor->processConfiguration($configuration, [$config]);
     }
 
     public function testManyConfigForProvider()
     {
-        $this->expectException(InvalidConfigurationException::class);
         $config = [
             'providers' => [
                 'stub' => [
@@ -62,6 +63,9 @@ public function testManyConfigForProvider()
 
         $processor = new Processor();
         $configuration = new MainConfiguration([], []);
+
+        $this->expectException(InvalidConfigurationException::class);
+
         $processor->processConfiguration($configuration, [$config]);
     }
 

Tests/DependencyInjection/Security/Factory/AccessTokenFactoryTest.php

@@ -145,9 +145,6 @@ public static function getOidcUserInfoConfiguration(): iterable
 
     public function testMultipleTokenHandlersSet()
     {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('You cannot configure multiple token handlers.');
-
         $config = [
             'token_handler' => [
                 'id' => 'in_memory_token_handler_service_id',
@@ -156,6 +153,10 @@ public function testMultipleTokenHandlersSet()
         ];
 
         $factory = new AccessTokenFactory($this->createTokenHandlerFactories());
+
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('You cannot configure multiple token handlers.');
+
         $this->processConfig($config, $factory);
     }
 

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -41,8 +41,6 @@ class SecurityExtensionTest extends TestCase
 {
     public function testInvalidCheckPath()
     {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('The check_path "/some_area/login_check" for login method "form_login" is not matched by the firewall pattern "/secured_area/.*".');
         $container = $this->getRawContainer();
 
         $container->loadFromExtension('security', [
@@ -60,13 +58,14 @@ public function testInvalidCheckPath()
             ],
         ]);
 
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('The check_path "/some_area/login_check" for login method "form_login" is not matched by the firewall pattern "/secured_area/.*".');
+
         $container->compile();
     }
 
     public function testFirewallWithInvalidUserProvider()
     {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('Unable to create definition for "security.user.provider.concrete.my_foo" user provider');
         $container = $this->getRawContainer();
 
         $extension = $container->getExtension('security');
@@ -85,6 +84,9 @@ public function testFirewallWithInvalidUserProvider()
             ],
         ]);
 
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Unable to create definition for "security.user.provider.concrete.my_foo" user provider');
+
         $container->compile();
     }
 
@@ -664,9 +666,6 @@ public static function provideEntryPointFirewalls(): iterable
      */
     public function testEntryPointRequired(array $firewall, string $messageRegex)
     {
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessageMatches($messageRegex);
-
         $container = $this->getRawContainer();
         $container->loadFromExtension('security', [
             'providers' => [
@@ -678,6 +677,9 @@ public function testEntryPointRequired(array $firewall, string $messageRegex)
             ],
         ]);
 
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessageMatches($messageRegex);
+
         $container->compile();
     }