Merge branch '2.7' into 2.8

* 2.7:
  [SecurityBundle] Backport test
  Fix misspelling variable
  [DI] minor: use a strict comparision in setDecoratedService
  Follow-on to #25825: Fix edge case in getParameterOption.
  keep the context when validating forms

Author: xabbuh

Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php

@@ -85,7 +85,6 @@ public function testHandleNonStringUsername($postOnly)
     {
         $request = Request::create('/login_check', 'POST', array('_username' => array()));
         $request->setSession($this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
-
         $listener = new UsernamePasswordFormAuthenticationListener(
             new TokenStorage(),
             $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock(),
@@ -96,9 +95,7 @@ public function testHandleNonStringUsername($postOnly)
             new DefaultAuthenticationFailureHandler($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $httpUtils),
             array('require_previous_session' => false, 'post_only' => $postOnly)
         );
-
         $event = new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $request, HttpKernelInterface::MASTER_REQUEST);
-
         $listener->handle($event);
     }