Merge branch '5.4' into 6.0

Author: derrabus

DependencyInjection/MainConfiguration.php

@@ -40,7 +40,7 @@ class MainConfiguration implements ConfigurationInterface
     private array $userProviderFactories;
 
     /**
-     * @param AuthenticatorFactoryInterface[] $factories
+     * @param array<int, AuthenticatorFactoryInterface> $factories
      */
     public function __construct(array $factories, array $userProviderFactories)
     {
@@ -187,6 +187,9 @@ private function addAccessControlSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
+    /**
+     * @param array<int, AuthenticatorFactoryInterface> $factories
+     */
     private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $factories)
     {
         $firewallNodeBuilder = $rootNode

DependencyInjection/SecurityExtension.php

@@ -615,7 +615,7 @@ private function getUserProvider(ContainerBuilder $container, string $id, array
             return 'security.user_providers';
         }
 
-        throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider for the "%s" listener on "%s" firewall is ambiguous as there is more than one registered provider.', $factoryKey, $id));
+        throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider for the "%s" %s on "%s" firewall is ambiguous as there is more than one registered provider.', $factoryKey, $this->authenticatorManagerEnabled ? 'authenticator' : 'listener', $id));
     }
 
     private function createHashers(array $hashers, ContainerBuilder $container)
@@ -958,7 +958,7 @@ private function isValidIp(string $cidr): bool
     }
 
     /**
-     * @return AuthenticatorFactoryInterface[]
+     * @return array<int, AuthenticatorFactoryInterface>
      */
     private function getSortedFactories(): array
     {

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -166,7 +166,7 @@ public function testPerListenerProvider()
     public function testMissingProviderForListener()
     {
         $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('Not configuring explicitly the provider for the "http_basic" listener on "ambiguous" firewall is ambiguous as there is more than one registered provider.');
+        $this->expectExceptionMessage('Not configuring explicitly the provider for the "http_basic" authenticator on "ambiguous" firewall is ambiguous as there is more than one registered provider.');
         $container = $this->getRawContainer();
         $container->loadFromExtension('security', [
             'enable_authenticator_manager' => true,