symfony
diff --git a/‎src/Symfony/Component/Security/Core/Exception/AuthenticationExpiredException.php
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎src/Symfony/Component/Security/Core/Exception/AuthenticationExpiredException.php
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
+3-2Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+3-2Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+3-2Lines changed: 3 additions & 2 deletions
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Core\Exception;
+
+/**
+ * AuthenticationServiceException is thrown when an authenticated token becomes un-authentcated between requests.
+ *
+ * In practice, this is due to the User changing between requests (e.g. password changes),
+ * causes the token to become un-authenticated.
+ *
+ * @author Ryan Weaver <ryan@knpuniversity.com>
+ */
+class AuthenticationExpiredException extends AccountStatusException
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getMessageKey()
+    {
+        return 'Authentication expired because your account information has changed.';
+    }
+}
@@ -21,6 +21,7 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Exception\AuthenticationExpiredException;
 
 /**
  * Responsible for accepting the PreAuthenticationGuardToken and calling
@@ -81,8 +82,8 @@ public function authenticate(TokenInterface $token)
                 return $token;
             }
 
-            // cause the logout - the token is not authenticated
-            return new AnonymousToken($this->providerKey, 'anon.');
+            // this AccountStatusException causes the user to be logged out
+            throw new AuthenticationExpiredException();
         }
 
         // find the *one* GuardAuthenticator that this token originated from
 
@@ -81,6 +81,9 @@ public function testAuthenticate()
         $this->assertSame($authedToken, $actualAuthedToken);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationExpiredException
+     */
     public function testGuardWithNoLongerAuthenticatedTriggersLogout()
     {
         $providerKey = 'my_firewall_abc';
@@ -93,8 +96,6 @@ public function testGuardWithNoLongerAuthenticatedTriggersLogout()
 
         $provider = new GuardAuthenticationProvider(array(), $this->userProvider, $providerKey, $this->userChecker);
         $actualToken = $provider->authenticate($token);
-        // this should return the anonymous user
-        $this->assertEquals(new AnonymousToken($providerKey, 'anon.'), $actualToken);
     }
 
     protected function setUp()
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,9 @@ public function testAuthenticate()`
`81`	`81`	`$this->assertSame($authedToken, $actualAuthedToken);`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ /**`
	`85`	`+ * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationExpiredException`
	`86`	`+ */`
`84`	`87`	`public function testGuardWithNoLongerAuthenticatedTriggersLogout()`
`85`	`88`	`{`
`86`	`89`	`$providerKey = 'my_firewall_abc';`
`@@ -93,8 +96,6 @@ public function testGuardWithNoLongerAuthenticatedTriggersLogout()`
`93`	`96`
`94`	`97`	`$provider = new GuardAuthenticationProvider(array(), $this->userProvider, $providerKey, $this->userChecker);`
`95`	`98`	`$actualToken = $provider->authenticate($token);`
`96`		`- // this should return the anonymous user`
`97`		`- $this->assertEquals(new AnonymousToken($providerKey, 'anon.'), $actualToken);`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`protected function setUp()`