Skip to content

Commit 69aa304

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Fix deprecation messages
2 parents c93f93d + 3611bfe commit 69aa304

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

DataCollector/SecurityDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function collect(Request $request, Response $response, \Throwable $except
104104
$impersonatorUser = null;
105105
if ($token instanceof SwitchUserToken) {
106106
$originalToken = $token->getOriginalToken();
107-
// @deprecated since 5.3, change to $originalToken->getUserIdentifier() in 6.0
107+
// @deprecated since Symfony 5.3, change to $originalToken->getUserIdentifier() in 6.0
108108
$impersonatorUser = method_exists($originalToken, 'getUserIdentifier') ? $originalToken->getUserIdentifier() : $originalToken->getUsername();
109109
}
110110

@@ -134,7 +134,7 @@ public function collect(Request $request, Response $response, \Throwable $except
134134
'token' => $token,
135135
'token_class' => $this->hasVarDumper ? new ClassStub(\get_class($token)) : \get_class($token),
136136
'logout_url' => $logoutUrl,
137-
// @deprecated since 5.3, change to $token->getUserIdentifier() in 6.0
137+
// @deprecated since Symfony 5.3, change to $token->getUserIdentifier() in 6.0
138138
'user' => method_exists($token, 'getUserIdentifier') ? $token->getUserIdentifier() : $token->getUsername(),
139139
'roles' => $assignedRoles,
140140
'inherited_roles' => array_unique($inheritedRoles),

0 commit comments

Comments
 (0)