Merge branch '5.3' into 5.4

* 5.3:
  [Security] Fix TypeError message
  Fix misleading error on missing provider with authenticator manager

Author: derrabus

DependencyInjection/SecurityExtension.php

@@ -710,7 +710,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 createEncoders(array $encoders, ContainerBuilder $container)

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -225,7 +225,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,