diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-01 14:07:40 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-07-01 14:07:40 +0200 |
| commit | d7338cbbe2c287f66bb7da9988fd8e8cd437ebb6 (patch) | |
| tree | dbec94916b7221cedaa2d031b7cf9ca0c6f9555a /Http/Tests | |
| parent | c46b28dca01d53efe9dd4e59109010538c219ff9 (diff) | |
| download | symfony-security-d7338cbbe2c287f66bb7da9988fd8e8cd437ebb6.zip symfony-security-d7338cbbe2c287f66bb7da9988fd8e8cd437ebb6.tar.gz symfony-security-d7338cbbe2c287f66bb7da9988fd8e8cd437ebb6.tar.bz2 | |
Fix merge
Diffstat (limited to 'Http/Tests')
| -rw-r--r-- | Http/Tests/Firewall/SwitchUserListenerTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php index eaa72db..f43b564 100644 --- a/Http/Tests/Firewall/SwitchUserListenerTest.php +++ b/Http/Tests/Firewall/SwitchUserListenerTest.php @@ -123,7 +123,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase ->getMock(); $role->expects($this->any())->method('getSource')->willReturn($originalToken); $this - ->securityContext + ->tokenStorage ->expects($this->any()) ->method('getToken') ->willReturn($this->getToken(array($role))); @@ -154,7 +154,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase })) ; - $listener = new SwitchUserListener($this->securityContext, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager, null, '_switch_user', 'ROLE_ALLOWED_TO_SWITCH', $dispatcher); + $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager, null, '_switch_user', 'ROLE_ALLOWED_TO_SWITCH', $dispatcher); $listener->handle($this->event); } |