From d7129b9a7e8b85b22e2559afe3bc5c6550494605 Mon Sep 17 00:00:00 2001
From: Alexander <iam.asm89@gmail.com>
Date: Sun, 15 Jul 2012 15:47:39 +0200
Subject: [PATCH] [Security] Fix exception constructors called in `UserChecker`

---
 .../Component/Security/Core/User/UserChecker.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Security/Core/User/UserChecker.php b/src/Symfony/Component/Security/Core/User/UserChecker.php
index 93897a1010..955cb19bbd 100644
--- a/src/Symfony/Component/Security/Core/User/UserChecker.php
+++ b/src/Symfony/Component/Security/Core/User/UserChecker.php
@@ -33,7 +33,9 @@ class UserChecker implements UserCheckerInterface
         }
 
         if (!$user->isCredentialsNonExpired()) {
-            throw new CredentialsExpiredException('User credentials have expired.', $user);
+            $ex = new CredentialsExpiredException('User credentials have expired.');
+            $ex->setExtraInformation($user);
+            throw $ex;
         }
     }
 
@@ -47,15 +49,21 @@ class UserChecker implements UserCheckerInterface
         }
 
         if (!$user->isAccountNonLocked()) {
-            throw new LockedException('User account is locked.', $user);
+            $ex = new LockedException('User account is locked.');
+            $ex->setExtraInformation($user);
+            throw $ex;
         }
 
         if (!$user->isEnabled()) {
-            throw new DisabledException('User account is disabled.', $user);
+            throw new DisabledException('User account is disabled.');
+            $ex->setExtraInformation($user);
+            throw $ex;
         }
 
         if (!$user->isAccountNonExpired()) {
-            throw new AccountExpiredException('User account has expired.', $user);
+            $ex = new AccountExpiredException('User account has expired.');
+            $ex->setExtraInformation($user);
+            throw $ex;
         }
     }
 }