Skip to content

Commit d70084b

Browse files
Merge branch '5.2' into 5.x
* 5.2: [Inflector][String] wrong plural form of words ending by "pectus" [HttpClient] Don't prepare the request in ScopingHttpClient [Console] Fixes for PHP 8.1 deprecations Make LoginRateLimiter case insentive Fix/Rewrite .gitignore regex builder Reset limiters on successful login Provide count argument for TooManyLoginAttemptsAuthenticationException to be able to translate in plural way [security] NullToken signature
2 parents f70a472 + 942b40f commit d70084b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Authentication/Token/NullToken.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getCredentials()
3333

3434
public function getUser()
3535
{
36-
return null;
36+
return '';
3737
}
3838

3939
public function setUser($user)

Exception/TooManyLoginAttemptsAuthenticationException.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public function getMessageData(): array
3333
{
3434
return [
3535
'%minutes%' => $this->threshold,
36+
'%count%' => (int) $this->threshold,
3637
];
3738
}
3839

0 commit comments

Comments
 (0)