Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit f69e4d62ec19 · 2021-12-16T22:52:00.000+01:00
* 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
diff --git a/Authentication/Provider/UserAuthenticationProvider.php b/Authentication/Provider/UserAuthenticationProvider.php
@@ -85,7 +85,7 @@ public function authenticate(TokenInterface $token)
             $this->userChecker->checkPreAuth($user);
             $this->checkAuthentication($user, $token);
             $this->userChecker->checkPostAuth($user);
-        } catch (AccountStatusException | BadCredentialsException $e) {
+        } catch (AccountStatusException|BadCredentialsException $e) {
             if ($this->hideUserNotFoundExceptions && !$e instanceof CustomUserMessageAccountStatusException) {
                 throw new BadCredentialsException('Bad credentials.', 0, $e);
             }
diff --git a/Signature/ExpiredSignatureStorage.php b/Signature/ExpiredSignatureStorage.php
@@ -15,8 +15,6 @@
 
 /**
  * @author Ryan Weaver <ryan@symfonycasts.com>
- *
- * @final
  */
 final class ExpiredSignatureStorage
 {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function authenticate(TokenInterface $token)`
`85`	`85`	`$this->userChecker->checkPreAuth($user);`
`86`	`86`	`$this->checkAuthentication($user, $token);`
`87`	`87`	`$this->userChecker->checkPostAuth($user);`
`88`		`- } catch (AccountStatusException \| BadCredentialsException $e) {`
	`88`	`+ } catch (AccountStatusException\|BadCredentialsException $e) {`
`89`	`89`	`if ($this->hideUserNotFoundExceptions && !$e instanceof CustomUserMessageAccountStatusException) {`
`90`	`90`	`throw new BadCredentialsException('Bad credentials.', 0, $e);`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @author Ryan Weaver <ryan@symfonycasts.com>`
`18`		`- *`
`19`		`- * @final`
`20`	`18`	`*/`
`21`	`19`	`final class ExpiredSignatureStorage`
`22`	`20`	`{`