Skip to content

Commit f69e4d6

Browse files
Merge branch '5.3' into 5.4
* 5.3: [5.3] cs fixes [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes [HttpClient] Fix tracing requests made after calling withOptions() [Cache] disable lock on CLI [VarDumper] add more "transient-on-macos" groups
2 parents 7b5ca7c + 2ce917f commit f69e4d6

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

Authentication/Provider/UserAuthenticationProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function authenticate(TokenInterface $token)
8585
$this->userChecker->checkPreAuth($user);
8686
$this->checkAuthentication($user, $token);
8787
$this->userChecker->checkPostAuth($user);
88-
} catch (AccountStatusException | BadCredentialsException $e) {
88+
} catch (AccountStatusException|BadCredentialsException $e) {
8989
if ($this->hideUserNotFoundExceptions && !$e instanceof CustomUserMessageAccountStatusException) {
9090
throw new BadCredentialsException('Bad credentials.', 0, $e);
9191
}

Signature/ExpiredSignatureStorage.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
/**
1717
* @author Ryan Weaver <[email protected]>
18-
*
19-
* @final
2018
*/
2119
final class ExpiredSignatureStorage
2220
{

0 commit comments

Comments
 (0)