fix ldap issues due to new security components (#2689)

src/Ldap/FormLoginLdapFactory.php

@@ -13,6 +13,7 @@ use Symfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory\SecurityF
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 /**
  * Inspired by https://github.com/Maks3w/FR3DLdapBundle @ MIT License
@@ -48,6 +49,7 @@ class FormLoginLdapFactory implements SecurityFactoryInterface
         $container
             ->setDefinition($providerId, new ChildDefinition(LdapAuthenticationProvider::class))
             ->replaceArgument(1, $id)
+            ->replaceArgument(2, new Reference($userProviderId))
         ;
 
         return $providerId;

src/Ldap/LdapAuthenticationProvider.php

@@ -11,7 +11,6 @@ namespace App\Ldap;
 
 use App\Configuration\LdapConfiguration;
 use App\Entity\User;
-use App\Security\DoctrineUserProvider;
 use Symfony\Component\Security\Core\Authentication\Provider\UserAuthenticationProvider;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -20,6 +19,7 @@ use Symfony\Component\Security\Core\Exception\BadCredentialsException;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 /**
  * Inspired by https://github.com/Maks3w/FR3DLdapBundle @ MIT License
@@ -30,7 +30,7 @@ class LdapAuthenticationProvider extends UserAuthenticationProvider
     private $ldapManager;
     private $config;
 
-    public function __construct(UserCheckerInterface $userChecker, $providerKey, DoctrineUserProvider $userProvider, LdapManager $ldapManager, LdapConfiguration $config, $hideUserNotFoundExceptions = true)
+    public function __construct(UserCheckerInterface $userChecker, $providerKey, UserProviderInterface $userProvider, LdapManager $ldapManager, LdapConfiguration $config, $hideUserNotFoundExceptions = true)
     {
         parent::__construct($userChecker, $providerKey, $hideUserNotFoundExceptions);
 

src/Security/DoctrineUserProvider.php

@@ -18,10 +18,7 @@ use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 
-/**
- * @final
- */
-class DoctrineUserProvider implements UserProviderInterface, PasswordUpgraderInterface
+final class DoctrineUserProvider implements UserProviderInterface, PasswordUpgraderInterface
 {
     /**
      * @var UserRepository