From 5f8047d242bec900ee54bff59aabb19c6b96840c Mon Sep 17 00:00:00 2001 From: Abdellatif AitBoudad Date: Fri, 24 Oct 2014 13:16:34 +0100 Subject: [PATCH] [Security][listener] change priority of switchuser --- .../DependencyInjection/SecurityExtension.php | 6 +++--- .../Tests/DependencyInjection/CompleteConfigurationTest.php | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index 17f16c0293..d69d070938 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -338,14 +338,14 @@ class SecurityExtension extends Extension $listeners = array_merge($listeners, $authListeners); - // Access listener - $listeners[] = new Reference('security.access_listener'); - // Switch user listener if (isset($firewall['switch_user'])) { $listeners[] = new Reference($this->createSwitchUserListener($container, $id, $firewall['switch_user'], $defaultProvider)); } + // Access listener + $listeners[] = new Reference('security.access_listener'); + // Determine default entry point if (isset($firewall['entry_point'])) { $defaultEntryPoint = $firewall['entry_point']; diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php index 2e55643c70..36ce80ef12 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php @@ -12,7 +12,6 @@ namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection; use Symfony\Component\DependencyInjection\Reference; - use Symfony\Component\DependencyInjection\Parameter; use Symfony\Bundle\SecurityBundle\SecurityBundle; use Symfony\Bundle\SecurityBundle\DependencyInjection\SecurityExtension; @@ -82,8 +81,8 @@ abstract class CompleteConfigurationTest extends \PHPUnit_Framework_TestCase 'security.authentication.listener.basic.secure', 'security.authentication.listener.digest.secure', 'security.authentication.listener.anonymous.secure', - 'security.access_listener', 'security.authentication.switchuser_listener.secure', + 'security.access_listener', ), ), $listeners); }