Skip to content

Commit d96ce0c

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: (31 commits) Fix parent serialization of user object [DependencyInjection] fixed typo add memcache, memcached, and mongodb extensions to run skipped tests [DependencyInjection] Fixed support for backslashes in service ids. fix #9356 [Security] Logger should manipulate the user reloaded from provider [BrowserKit] fixes #8311 CookieJar is totally ignorant of RFC 6265 edge cases [HttpFoundation] fixed constants that do exist in 2.3 (only in 2.4) fix 5528 let ArrayNode::normalizeValue respect order of value array provided fix #7243 allow 0 as arraynode name Fixed issue in BaseDateTimeTransformer when invalid timezone cause Transformation filed exception (closes #9403). BinaryFileResponse should also return 416 or 200 on some range-requets Do normalization on tag options bumped Symfony version to 2.3.9 updated VERSION for 2.3.8 update CONTRIBUTORS for 2.3.8 updated CHANGELOG for 2.3.8 [Filesystem] Changed the mode for a target file in copy() to be write only. [Console] fixed CS fixed TableHelper when cell value has new line Improved and fixed grammar mistakes. Added pluralized messages ... Conflicts: src/Symfony/Component/BrowserKit/Cookie.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Routing/Matcher/UrlMatcher.php
2 parents f443ddf + 725ec05 commit d96ce0c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Firewall/ContextListener.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,19 @@ private function refreshUser(TokenInterface $token)
155155

156156
foreach ($this->userProviders as $provider) {
157157
try {
158-
$token->setUser($provider->refreshUser($user));
158+
$refreshedUser = $provider->refreshUser($user);
159+
$token->setUser($refreshedUser);
159160

160161
if (null !== $this->logger) {
161-
$this->logger->debug(sprintf('Username "%s" was reloaded from user provider.', $user->getUsername()));
162+
$this->logger->debug(sprintf('Username "%s" was reloaded from user provider.', $refreshedUser->getUsername()));
162163
}
163164

164165
return $token;
165166
} catch (UnsupportedUserException $unsupported) {
166167
// let's try the next user provider
167168
} catch (UsernameNotFoundException $notFound) {
168169
if (null !== $this->logger) {
169-
$this->logger->warning(sprintf('Username "%s" could not be found.', $user->getUsername()));
170+
$this->logger->warning(sprintf('Username "%s" could not be found.', $notFound->getUsername()));
170171
}
171172

172173
return null;

0 commit comments

Comments
 (0)