symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
+8-2Lines changed: 8 additions & 2 deletions b/‎src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
+8-2Lines changed: 8 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
+4-1Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/SecuredPageBundle/Security/Core/User/ArrayUserProvider.php
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Ldap/Security/LdapUserProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Ldap/Security/LdapUserProvider.php
+12-3Lines changed: 12 additions & 3 deletions b/‎src/Symfony/Component/Ldap/Security/LdapUserProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Ldap/Security/LdapUserProvider.php
+12-3Lines changed: 12 additions & 3 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
+4-1Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Guard/Provider/GuardAuthenticationProvider.php
+4-1Lines changed: 4 additions & 1 deletion
@@ -62,7 +62,10 @@ public function loadUserByUsername($username)
         }
 
         if (null === $user) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e->setUsername($username);
+
+            throw $e;
         }
 
         return $user;
@@ -92,7 +95,10 @@ public function refreshUser(UserInterface $user)
 
             $refreshedUser = $repository->find($id);
             if (null === $refreshedUser) {
-                throw new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
+                $e = new UsernameNotFoundException('User with id '.json_encode($id).' not found.');
+                $e->setUsername(json_encode($id));
+
+                throw $e;
             }
         }
 
 
@@ -34,7 +34,10 @@ public function loadUserByUsername($username)
         $user = $this->getUser($username);
 
         if (null === $user) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e->setUsername($username);
+
+            throw $e;
         }
 
         return $user;
 
@@ -73,18 +73,27 @@ public function loadUserByUsername($username)
             $query = str_replace('{username}', $username, $this->defaultSearch);
             $search = $this->ldap->query($this->baseDn, $query);
         } catch (ConnectionException $e) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username), 0, $e);
+            $e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username), 0, $e);
+            $e->setUsername($username);
+
+            throw $e;
         }
 
         $entries = $search->execute();
         $count = \count($entries);
 
         if (!$count) {
-            throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));
+            $e->setUsername($username);
+
+            throw $e;
         }
 
         if ($count > 1) {
-            throw new UsernameNotFoundException('More than one user found.');
+            $e = new UsernameNotFoundException('More than one user found.');
+            $e->setUsername($username);
+
+            throw $e;
         }
 
         $entry = $entries[0];
 
@@ -105,7 +105,10 @@ private function authenticateViaGuard(AuthenticatorInterface $guardAuthenticator
         $user = $guardAuthenticator->getUser($token->getCredentials(), $this->userProvider);
 
         if (null === $user) {
-            throw new UsernameNotFoundException(sprintf('Null returned from "%s::getUser()".', \get_class($guardAuthenticator)));
+            $e = new UsernameNotFoundException(sprintf('Null returned from "%s::getUser()".', \get_class($guardAuthenticator)));
+            $e->setUsername($token->getUsername());
+
+            throw $e;
         }
 
         if (!$user instanceof UserInterface) {
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,10 @@ public function loadUserByUsername($username)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (null === $user) {`
`65`		`- throw new UsernameNotFoundException(sprintf('User "%s" not found.', $username));`
	`65`	`+ $e = new UsernameNotFoundException(sprintf('User "%s" not found.', $username));`
	`66`	`+ $e->setUsername($username);`
	`67`	`+`
	`68`	`+ throw $e;`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`return $user;`
`@@ -92,7 +95,10 @@ public function refreshUser(UserInterface $user)`
`92`	`95`
`93`	`96`	`$refreshedUser = $repository->find($id);`
`94`	`97`	`if (null === $refreshedUser) {`
`95`		`- throw new UsernameNotFoundException('User with id '.json_encode($id).' not found.');`
	`98`	`+ $e = new UsernameNotFoundException('User with id '.json_encode($id).' not found.');`
	`99`	`+ $e->setUsername(json_encode($id));`
	`100`	`+`
	`101`	`+ throw $e;`
`96`	`102`	`}`
`97`	`103`	`}`
`98`	`104`