Merge branch '6.0' into 6.1

fabpot · fabpot · commit d402e86ce94b · 2022-10-28T18:23:08.000+02:00
* 6.0:
  Typos In Comments
  Typos on 6.0 branch
  remove duplicated catch block
  s/&lt;\br&gt;/&lt;br&gt;
  [HttpClient] Fix retrying requests when the content is used by the strategy
diff --git a/KernelBrowser.php b/KernelBrowser.php
@@ -119,7 +119,7 @@ public function loginUser(object $user, string $firewallContext = 'main'): stati
         }
 
         $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
-        // required for compatibilty with Symfony 5.4
+        // required for compatibility with Symfony 5.4
         if (method_exists($token, 'isAuthenticated')) {
             $token->setAuthenticated(true, false);
         }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function loginUser(object $user, string $firewallContext = 'main'): stati`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`$token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);`
`122`		`- // required for compatibilty with Symfony 5.4`
	`122`	`+ // required for compatibility with Symfony 5.4`
`123`	`123`	`if (method_exists($token, 'isAuthenticated')) {`
`124`	`124`	`$token->setAuthenticated(true, false);`
`125`	`125`	`}`