diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-03-25 16:39:22 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-03-25 16:39:22 +0100 |
| commit | 535f34efbde200c28f1f10ba531e24bb95cf55d5 (patch) | |
| tree | a781ff44b64bff0e07eb06e9bb9515459348615d /Http | |
| parent | 1a56ae95e84784bcd003c697a8173921412beee7 (diff) | |
| parent | f9e167fde187546f3eb91f62d8de5ba36483a70a (diff) | |
| download | symfony-security-535f34efbde200c28f1f10ba531e24bb95cf55d5.zip symfony-security-535f34efbde200c28f1f10ba531e24bb95cf55d5.tar.gz symfony-security-535f34efbde200c28f1f10ba531e24bb95cf55d5.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
fix mocks
Conflicts:
src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
Diffstat (limited to 'Http')
| -rw-r--r-- | Http/Tests/Firewall/SwitchUserListenerTest.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php index f43b564..bcba3c2 100644 --- a/Http/Tests/Firewall/SwitchUserListenerTest.php +++ b/Http/Tests/Firewall/SwitchUserListenerTest.php @@ -55,7 +55,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase $this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue(null)); $this->event->expects($this->never())->method('setResponse'); - $this->tokenStorage->expects($this->never())->method('setToken'); + $this->securityContext->expects($this->never())->method('setToken'); $listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager); $listener->handle($this->event); |