Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit c2eeb2929abe · 2018-04-26T13:33:17.000+02:00
* 2.8:
  Make the simple auth provider the same as in Symfony 2.7.
diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/SimpleAuthenticationProvider.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Security\Core\Authentication\Provider;
 
-use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserChecker;
 use Symfony\Component\Security\Core\User\UserCheckerInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -50,20 +48,7 @@ public function authenticate(TokenInterface $token)
         $user = $authToken->getUser();
 
         if (!$user instanceof UserInterface) {
-            try {
-                $user = $this->userProvider->loadUserByUsername($user);
-
-                if (!$user instanceof UserInterface) {
-                    return $authToken;
-                }
-            } catch (UsernameNotFoundException $e) {
-                $e->setUsername($user);
-                throw $e;
-            } catch (\Exception $e) {
-                $e = new AuthenticationServiceException($e->getMessage(), 0, $e);
-                $e->setToken($token);
-                throw $e;
-            }
+            return $authToken;
         }
 
         $this->userChecker->checkPreAuth($user);
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Security\Core\Authentication\Provider\SimpleAuthenticationProvider;
 use Symfony\Component\Security\Core\Exception\DisabledException;
 use Symfony\Component\Security\Core\Exception\LockedException;
-use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\User\UserChecker;
 
 class SimpleAuthenticationProviderTest extends TestCase
@@ -74,54 +73,6 @@ public function testAuthenticateWhenPostChecksFails()
         $provider->authenticate($token);
     }
 
-    public function testAuthenticateFromString()
-    {
-        $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
-
-        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
-        $token->expects($this->any())
-            ->method('getUser')
-            ->will($this->returnValue('foo'));
-
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
-        $authenticator->expects($this->once())
-            ->method('authenticateToken')
-            ->will($this->returnValue($token));
-
-        $userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
-        $userProvider->expects($this->once())
-            ->method('loadUserByUsername')
-            ->willReturn($this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock());
-        $provider = $this->getProvider($authenticator, $userProvider);
-
-        $this->assertSame($token, $provider->authenticate($token));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
-     */
-    public function testUsernameNotFound()
-    {
-        $user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
-
-        $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
-        $token->expects($this->any())
-            ->method('getUser')
-            ->will($this->returnValue('foo'));
-
-        $authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
-        $authenticator->expects($this->once())
-            ->method('authenticateToken')
-            ->will($this->returnValue($token));
-
-        $userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
-        $userProvider->expects($this->once())
-            ->method('loadUserByUsername')
-            ->willThrowException(new UsernameNotFoundException());
-
-        $this->getProvider($authenticator, $userProvider)->authenticate($token);
-    }
-
     public function testAuthenticateSkipsUserChecksForNonUserInterfaceObjects()
     {
         $token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
