Various tweaks 4.3

Author: fabpot

Firewall/LegacyListenerTrait.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Security\Http\Firewall;
 
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 

Tests/Firewall/SwitchUserListenerTest.php

@@ -109,7 +109,7 @@ public function testExitUserUpdatesToken()
     public function testExitUserBasedOnSwitchUserRoleUpdatesToken()
     {
         $originalToken = new UsernamePasswordToken('username', '', 'key', []);
-        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', [new SwitchUserRole('ROLE_PREVIOUS', $originalToken, false)], $originalToken));
+        $this->tokenStorage->setToken(new UsernamePasswordToken('username', '', 'key', [new SwitchUserRole('ROLE_PREVIOUS', $originalToken, false)]));
 
         $this->request->query->set('_switch_user', SwitchUserListener::EXIT_VALUE);