Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit 0eb2ec0091b2 · 2021-12-16T22:37:57.000+01:00
* 4.4:
  [Cache] Fix saving items with no expiration through ProxyAdapter
  CS fixes
  [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);
             }

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`	`}`