Merge branch '6.3' into 6.4

* 6.3:
  fix used class after merge
  fix tests

Author: xabbuh

Tests/Authentication/AuthenticationUtilsTest.php

@@ -16,59 +16,65 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
+use Symfony\Component\Security\Http\SecurityRequestAttributes;
 
 class AuthenticationUtilsTest extends TestCase
 {
     public function testLastAuthenticationErrorWhenRequestHasAttribute()
     {
+        $authenticationError = new AuthenticationException();
         $request = Request::create('/');
-        $request->attributes->set(Security::AUTHENTICATION_ERROR, 'my error');
+        $request->attributes->set(SecurityRequestAttributes::AUTHENTICATION_ERROR, $authenticationError);
 
         $requestStack = new RequestStack();
         $requestStack->push($request);
 
         $utils = new AuthenticationUtils($requestStack);
-        $this->assertSame('my error', $utils->getLastAuthenticationError());
+        $this->assertSame($authenticationError, $utils->getLastAuthenticationError());
     }
 
     public function testLastAuthenticationErrorInSession()
     {
+        $authenticationError = new AuthenticationException();
+
         $request = Request::create('/');
 
         $session = new Session(new MockArraySessionStorage());
-        $session->set(Security::AUTHENTICATION_ERROR, 'session error');
+        $session->set(SecurityRequestAttributes::AUTHENTICATION_ERROR, $authenticationError);
         $request->setSession($session);
 
         $requestStack = new RequestStack();
         $requestStack->push($request);
 
         $utils = new AuthenticationUtils($requestStack);
-        $this->assertSame('session error', $utils->getLastAuthenticationError());
-        $this->assertFalse($session->has(Security::AUTHENTICATION_ERROR));
+        $this->assertSame($authenticationError, $utils->getLastAuthenticationError());
+        $this->assertFalse($session->has(SecurityRequestAttributes::AUTHENTICATION_ERROR));
     }
 
     public function testLastAuthenticationErrorInSessionWithoutClearing()
     {
+        $authenticationError = new AuthenticationException();
+
         $request = Request::create('/');
 
         $session = new Session(new MockArraySessionStorage());
-        $session->set(Security::AUTHENTICATION_ERROR, 'session error');
+        $session->set(SecurityRequestAttributes::AUTHENTICATION_ERROR, $authenticationError);
         $request->setSession($session);
 
         $requestStack = new RequestStack();
         $requestStack->push($request);
 
         $utils = new AuthenticationUtils($requestStack);
-        $this->assertSame('session error', $utils->getLastAuthenticationError(false));
-        $this->assertTrue($session->has(Security::AUTHENTICATION_ERROR));
+        $this->assertSame($authenticationError, $utils->getLastAuthenticationError(false));
+        $this->assertTrue($session->has(SecurityRequestAttributes::AUTHENTICATION_ERROR));
     }
 
     public function testLastUserNameIsDefinedButNull()
     {
         $request = Request::create('/');
-        $request->attributes->set(Security::LAST_USERNAME, null);
+        $request->attributes->set(SecurityRequestAttributes::LAST_USERNAME, null);
 
         $requestStack = new RequestStack();
         $requestStack->push($request);
@@ -80,7 +86,7 @@ public function testLastUserNameIsDefinedButNull()
     public function testLastUserNameIsDefined()
     {
         $request = Request::create('/');
-        $request->attributes->set(Security::LAST_USERNAME, 'user');
+        $request->attributes->set(SecurityRequestAttributes::LAST_USERNAME, 'user');
 
         $requestStack = new RequestStack();
         $requestStack->push($request);
@@ -94,7 +100,7 @@ public function testLastUserNameIsDefinedInSessionButNull()
         $request = Request::create('/');
 
         $session = new Session(new MockArraySessionStorage());
-        $session->set(Security::LAST_USERNAME, null);
+        $session->set(SecurityRequestAttributes::LAST_USERNAME, null);
         $request->setSession($session);
 
         $requestStack = new RequestStack();
@@ -109,7 +115,7 @@ public function testLastUserNameIsDefinedInSession()
         $request = Request::create('/');
 
         $session = new Session(new MockArraySessionStorage());
-        $session->set(Security::LAST_USERNAME, 'user');
+        $session->set(SecurityRequestAttributes::LAST_USERNAME, 'user');
         $request->setSession($session);
 
         $requestStack = new RequestStack();