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

1 files changed, 7 insertions, 2 deletions

diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php
index bca2c4a..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())
@@ -187,11 +186,17 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase
         $this
             ->request
             ->expects($this->any())
-            ->method('all')
+            ->method('get')
             ->with('_switch_user')
             ->willReturn('_exit');
         $this
             ->request
+            ->query
+            ->expects($this->any())
+            ->method('all')
+            ->will($this->returnValue(array()));
+        $this
+            ->request
             ->expects($this->any())
             ->method('getUri')
             ->willReturn('/');