symfony
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicFactory.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+16-1Lines changed: 16 additions & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+16-1Lines changed: 16 additions & 1 deletion
@@ -99,7 +99,7 @@ final public function addOption(string $name, $default = null)
      * Subclasses must return the id of a service which implements the
      * AuthenticationProviderInterface.
      *
-     * @return string never null, the id of the authentication provider
+     * @return string never null, the id ofSymfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory the authentication provider
      */
     abstract protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId);
 
 
@@ -21,7 +21,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class HttpBasicFactory implements SecurityFactoryInterface, AuthenticatorFactoryInterface
+class HttpBasicFactory implements SecurityFactoryInterface, AuthenticatorFactoryInterface, EntryPointFactoryInterface
 {
     public function create(ContainerBuilder $container, string $id, array $config, string $userProvider, ?string $defaultEntryPoint)
     {
@@ -77,7 +77,7 @@ public function addConfiguration(NodeDefinition $node)
         ;
     }
 
-    protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint)
+    public function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint): string
     {
         if (null !== $defaultEntryPoint) {
             return $defaultEntryPoint;
 
@@ -39,6 +39,7 @@
 use Symfony\Component\Security\Core\User\ChainUserProvider;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Http\Controller\UserValueResolver;
+use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
 use Twig\Extension\AbstractExtension;
 
 /**
@@ -519,6 +520,7 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
     {
         $listeners = [];
         $hasListeners = false;
+        $entryPoints = [];
 
         foreach ($this->listenerPositions as $position) {
             foreach ($this->factories[$position] as $factory) {
@@ -542,7 +544,7 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
                         }
 
                         if ($factory instanceof EntryPointFactoryInterface) {
-                            $defaultEntryPoint = $factory->createEntryPoint($container, $id, $firewall[$key], $defaultEntryPoint);
+                            $entryPoints[$key] = $factory->createEntryPoint($container, $id, $firewall[$key], null);
                         }
                     } else {
                         list($provider, $listenerId, $defaultEntryPoint) = $factory->create($container, $id, $firewall[$key], $userProvider, $defaultEntryPoint);
@@ -555,6 +557,19 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
             }
         }
 
+        if ([] !== $entryPoints) {
+            // we can be sure the authenticator system is enabled
+            if (null !== $defaultEntryPoint) {
+                return $entryPoints[$defaultEntryPoint] ?? $defaultEntryPoint;
+            }
+
+            if (1 === \count($entryPoints)) {
+                return current($entryPoints);
+            }
+
+            throw new InvalidConfigurationException(sprintf('Because you have multiple authenticators in firewall "%s", you need to set the "entry_point" key to one of your authenticators (%s) or a service ID implementing "%s".', $id, implode(', ', $entryPoints), AuthenticationEntryPointInterface::class));
+        }
+
         if (false === $hasListeners) {
             throw new InvalidConfigurationException(sprintf('No authentication listener registered for firewall "%s".', $id));
         }
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ final public function addOption(string $name, $default = null)`
`99`	`99`	`* Subclasses must return the id of a service which implements the`
`100`	`100`	`* AuthenticationProviderInterface.`
`101`	`101`	`*`
`102`		`- * @return string never null, the id of the authentication provider`
	`102`	`+ * @return string never null, the id ofSymfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory the authentication provider`
`103`	`103`	`*/`
`104`	`104`	`abstract protected function createAuthProvider(ContainerBuilder $container, string $id, array $config, string $userProviderId);`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`* @author Fabien Potencier <fabien@symfony.com>`
`23`	`23`	`*/`
`24`		`-class HttpBasicFactory implements SecurityFactoryInterface, AuthenticatorFactoryInterface`
	`24`	`+class HttpBasicFactory implements SecurityFactoryInterface, AuthenticatorFactoryInterface, EntryPointFactoryInterface`
`25`	`25`	`{`
`26`	`26`	`public function create(ContainerBuilder $container, string $id, array $config, string $userProvider, ?string $defaultEntryPoint)`
`27`	`27`	`{`
`@@ -77,7 +77,7 @@ public function addConfiguration(NodeDefinition $node)`
`77`	`77`	`;`
`78`	`78`	`}`
`79`	`79`
`80`		`- protected function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint)`
	`80`	`+ public function createEntryPoint(ContainerBuilder $container, string $id, array $config, ?string $defaultEntryPoint): string`
`81`	`81`	`{`
`82`	`82`	`if (null !== $defaultEntryPoint) {`
`83`	`83`	`return $defaultEntryPoint;`