Merge pull request #2492 from ossinkine/issue-2492

Inject firewall's UserChecker into LoginManager

Author: XWB

DependencyInjection/Compiler/InjectUserCheckerPass.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\UserBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Injects firewall's UserChecker into LoginManager.
+ *
+ * @author Gocha Ossinkine <ossinkine@ya.ru>
+ */
+class InjectUserCheckerPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $firewallName = $container->getParameter('fos_user.firewall_name');
+        $loginManager = $container->getDefinition('fos_user.security.login_manager');
+
+        if ($container->hasAlias('security.user_checker.'.$firewallName)) {
+            $loginManager->replaceArgument(1, new Reference('security.user_checker.'.$firewallName));
+        }
+    }
+}

FOSUserBundle.php

@@ -15,6 +15,7 @@
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
 use Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler\DoctrineMongoDBMappingsPass;
 use FOS\UserBundle\DependencyInjection\Compiler\InjectRememberMeServicesPass;
+use FOS\UserBundle\DependencyInjection\Compiler\InjectUserCheckerPass;
 use FOS\UserBundle\DependencyInjection\Compiler\ValidationPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -32,6 +33,7 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
         $container->addCompilerPass(new ValidationPass());
+        $container->addCompilerPass(new InjectUserCheckerPass());
         $container->addCompilerPass(new InjectRememberMeServicesPass());
 
         $this->addRegisterMappingsPass($container);