Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit f3e0563

Browse files
Merge branch '3.4' into 4.1
* 3.4: [EventDispatcher] Revers event tracing order [Security] Prefer clone over unserialize(serialize()) for user refreshment [Console] OutputFormatter: move strtolower to createStyleFromString Adjust tests to work in the armhf architecture. Fixes #29281. Vietnamese translations improvement [Form] Fixed FormErrorIterator class phpdoc Renamed test controller from Controller to TestController so it doesn't show up in the IDE autocomplete. Don't use he in docs when its not needed EventSubscriberInterface isn't a man fixed public directory of web server and assets install when configured in composer.json
2 parents 08c49b2 + 6990c37 commit f3e0563

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Core/Resources/translations/security.vi.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</trans-unit>
4545
<trans-unit id="12">
4646
<source>Username could not be found.</source>
47-
<target>Không tìm thấy tên người dùng username.</target>
47+
<target>Không tìm thấy tên người dùng.</target>
4848
</trans-unit>
4949
<trans-unit id="13">
5050
<source>Account has expired.</source>

Http/Firewall/ContextListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ protected function refreshUser(TokenInterface $token)
170170

171171
try {
172172
$refreshedUser = $provider->refreshUser($user);
173-
$newToken = unserialize(serialize($token));
173+
$newToken = clone $token;
174174
$newToken->setUser($refreshedUser);
175175

176176
// tokens can be deauthenticated if the user has been changed.

0 commit comments

Comments
 (0)