[Security][listener] change priority of switchuser

symfony · Oct 24, 2014 · 5f8047d · 5f8047d
1 parent 016b0a9
commit 5f8047d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -338,14 +338,14 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
 
         $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
@@ -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 @@ public function testFirewalls()
                 '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);
     }