Merge branch '2.3' into 2.7

xabbuh · xabbuh · commit 5b789c31e791 · 2016-04-09T12:56:56.000+02:00
* 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
diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -161,7 +161,6 @@ public function testExitUserDispatchesEventWithRefreshedUser()
     public function testExitUserDoesNotDispatchEventWithStringUser()
     {
         $originalUser = 'anon.';
-        $refreshedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
         $this
             ->userProvider
             ->expects($this->never())

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,6 @@ public function testExitUserDispatchesEventWithRefreshedUser()`
`161`	`161`	`public function testExitUserDoesNotDispatchEventWithStringUser()`
`162`	`162`	`{`
`163`	`163`	`$originalUser = 'anon.';`
`164`		`- $refreshedUser = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');`
`165`	`164`	`$this`
`166`	`165`	`->userProvider`
`167`	`166`	`->expects($this->never())`