Skip to content

Commit dea146b

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [Filesystem] Better error handling in remove() [DependencyInjection] Add coverage for invalid Expression in exportParameters [DependencyInjection] Add coverage for all invalid arguments in exportParameters anonymous services are always private [Console] Correct time formatting. [DependencyInjection] Resolve aliases before removing abstract services + add tests Fix Dom Crawler select option with empty value Remove unnecessary option assignment remove unused variable mock the proper method [PropertyAccess] Fix regression
2 parents 078d425 + 8c16bf9 commit dea146b

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Tests/Firewall/SwitchUserListenerTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ public function testExitUserDispatchesEventWithRefreshedUser()
161161
public function testExitUserDoesNotDispatchEventWithStringUser()
162162
{
163163
$originalUser = 'anon.';
164-
$refreshedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
165164
$this
166165
->userProvider
167166
->expects($this->never())
@@ -187,9 +186,15 @@ public function testExitUserDoesNotDispatchEventWithStringUser()
187186
$this
188187
->request
189188
->expects($this->any())
190-
->method('all')
189+
->method('get')
191190
->with('_switch_user')
192191
->willReturn('_exit');
192+
$this
193+
->request
194+
->query
195+
->expects($this->any())
196+
->method('all')
197+
->will($this->returnValue(array()));
193198
$this
194199
->request
195200
->expects($this->any())

0 commit comments

Comments
 (0)