diff options
| author | Christian Flothmann <christian.flothmann@xabbuh.de> | 2016-04-09 12:56:56 +0200 |
|---|---|---|
| committer | Christian Flothmann <christian.flothmann@xabbuh.de> | 2016-04-09 12:56:56 +0200 |
| commit | 5b789c31e791c6e499644f203b51e8302e467039 (patch) | |
| tree | 886853355beb8fb833e528376305084973612205 | |
| parent | 537c417b8af69c054d7e06a1b804062c9cdcfd64 (diff) | |
| parent | 28ff48df813cb85b2efa0aaa3e487981b08880cd (diff) | |
| download | symfony-security-5b789c31e791c6e499644f203b51e8302e467039.zip symfony-security-5b789c31e791c6e499644f203b51e8302e467039.tar.gz symfony-security-5b789c31e791c6e499644f203b51e8302e467039.tar.bz2 | |
Merge branch '2.3' into 2.7v2.7.12
* 2.3:
[DependencyInjection] Resolve aliases before removing abstract services + add tests
Fix Dom Crawler select option with empty value
Remove unnecessary option assignment
remove unused variable
[PropertyAccess] Fix regression
| -rw-r--r-- | Http/Tests/Firewall/SwitchUserListenerTest.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php index b004b27..28d73e0 100644 --- a/Http/Tests/Firewall/SwitchUserListenerTest.php +++ b/Http/Tests/Firewall/SwitchUserListenerTest.php @@ -161,7 +161,6 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase public function testExitUserDoesNotDispatchEventWithStringUser() { $originalUser = 'anon.'; - $refreshedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface'); $this ->userProvider ->expects($this->never()) |