Merge branch '6.4' into 7.0

* 6.4:
  Fix implicitly-required parameters
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
  [Messenger][AmazonSqs] Allow async-aws/sqs version 2

Author: nicolas-grekas

AbstractBrowser.php

@@ -54,7 +54,7 @@ abstract class AbstractBrowser
     /**
      * @param array $server The server parameters (equivalent of $_SERVER)
      */
-    public function __construct(array $server = [], History $history = null, CookieJar $cookieJar = null)
+    public function __construct(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null)
     {
         $this->setServerParameters($server);
         $this->history = $history ?? new History();
@@ -142,7 +142,7 @@ public function getServerParameter(string $key, mixed $default = ''): mixed
         return $this->server[$key] ?? $default;
     }
 
-    public function xmlHttpRequest(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], string $content = null, bool $changeHistory = true): Crawler
+    public function xmlHttpRequest(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], ?string $content = null, bool $changeHistory = true): Crawler
     {
         $this->setServerParameter('HTTP_X_REQUESTED_WITH', 'XMLHttpRequest');
 
@@ -323,7 +323,7 @@ public function submitForm(string $button, array $fieldValues = [], string $meth
      * @param string $content       The raw body data
      * @param bool   $changeHistory Whether to update the history or not (only used internally for back(), forward(), and reload())
      */
-    public function request(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], string $content = null, bool $changeHistory = true): Crawler
+    public function request(string $method, string $uri, array $parameters = [], array $files = [], array $server = [], ?string $content = null, bool $changeHistory = true): Crawler
     {
         if ($this->isMainRequest) {
             $this->redirectCount = 0;

Cookie.php

@@ -58,7 +58,7 @@ class Cookie
      * @param bool        $encodedValue Whether the value is encoded or not
      * @param string|null $samesite     The cookie samesite attribute
      */
-    public function __construct(string $name, ?string $value, string $expires = null, string $path = null, string $domain = '', bool $secure = false, bool $httponly = true, bool $encodedValue = false, string $samesite = null)
+    public function __construct(string $name, ?string $value, ?string $expires = null, ?string $path = null, string $domain = '', bool $secure = false, bool $httponly = true, bool $encodedValue = false, ?string $samesite = null)
     {
         if ($encodedValue) {
             $this->rawValue = $value ?? '';
@@ -124,7 +124,7 @@ public function __toString(): string
      *
      * @throws InvalidArgumentException
      */
-    public static function fromString(string $cookie, string $url = null): static
+    public static function fromString(string $cookie, ?string $url = null): static
     {
         $parts = explode(';', $cookie);
 

CookieJar.php

@@ -35,7 +35,7 @@ public function set(Cookie $cookie): void
      * (this behavior ensures a BC behavior with previous versions of
      * Symfony).
      */
-    public function get(string $name, string $path = '/', string $domain = null): ?Cookie
+    public function get(string $name, string $path = '/', ?string $domain = null): ?Cookie
     {
         $this->flushExpiredCookies();
 
@@ -67,7 +67,7 @@ public function get(string $name, string $path = '/', string $domain = null): ?C
      * all cookies for the given name/path expire (this behavior
      * ensures a BC behavior with previous versions of Symfony).
      */
-    public function expire(string $name, ?string $path = '/', string $domain = null): void
+    public function expire(string $name, ?string $path = '/', ?string $domain = null): void
     {
         $path ??= '/';
 
@@ -105,7 +105,7 @@ public function clear(): void
      *
      * @param string[] $setCookies Set-Cookie headers from an HTTP response
      */
-    public function updateFromSetCookie(array $setCookies, string $uri = null): void
+    public function updateFromSetCookie(array $setCookies, ?string $uri = null): void
     {
         $cookies = [];
 
@@ -131,7 +131,7 @@ public function updateFromSetCookie(array $setCookies, string $uri = null): void
     /**
      * Updates the cookie jar from a Response object.
      */
-    public function updateFromResponse(Response $response, string $uri = null): void
+    public function updateFromResponse(Response $response, ?string $uri = null): void
     {
         $this->updateFromSetCookie($response->getHeader('Set-Cookie', false), $uri);
     }

HttpBrowser.php

@@ -29,7 +29,7 @@ class HttpBrowser extends AbstractBrowser
 {
     private HttpClientInterface $client;
 
-    public function __construct(HttpClientInterface $client = null, History $history = null, CookieJar $cookieJar = null)
+    public function __construct(?HttpClientInterface $client = null, ?History $history = null, ?CookieJar $cookieJar = null)
     {
         if (!$client && !class_exists(HttpClient::class)) {
             throw new LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__));

Request.php

@@ -33,7 +33,7 @@ class Request
      * @param array  $server     An array of server parameters
      * @param string $content    The raw body data
      */
-    public function __construct(string $uri, string $method, array $parameters = [], array $files = [], array $cookies = [], array $server = [], string $content = null)
+    public function __construct(string $uri, string $method, array $parameters = [], array $files = [], array $cookies = [], array $server = [], ?string $content = null)
     {
         $this->uri = $uri;
         $this->method = $method;

Test/Constraint/BrowserCookieValueSame.php

@@ -22,7 +22,7 @@ final class BrowserCookieValueSame extends Constraint
     private string $path;
     private ?string $domain;
 
-    public function __construct(string $name, string $value, bool $raw = false, string $path = '/', string $domain = null)
+    public function __construct(string $name, string $value, bool $raw = false, string $path = '/', ?string $domain = null)
     {
         $this->name = $name;
         $this->path = $path;

Test/Constraint/BrowserHasCookie.php

@@ -20,7 +20,7 @@ final class BrowserHasCookie extends Constraint
     private string $path;
     private ?string $domain;
 
-    public function __construct(string $name, string $path = '/', string $domain = null)
+    public function __construct(string $name, string $path = '/', ?string $domain = null)
     {
         $this->name = $name;
         $this->path = $path;

Tests/AbstractBrowserTest.php

@@ -21,7 +21,7 @@
 
 class AbstractBrowserTest extends TestCase
 {
-    public function getBrowser(array $server = [], History $history = null, CookieJar $cookieJar = null)
+    public function getBrowser(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null)
     {
         return new TestClient($server, $history, $cookieJar);
     }

Tests/HttpBrowserTest.php

@@ -19,7 +19,7 @@
 
 class HttpBrowserTest extends AbstractBrowserTest
 {
-    public function getBrowser(array $server = [], History $history = null, CookieJar $cookieJar = null)
+    public function getBrowser(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null)
     {
         return new TestHttpClient($server, $history, $cookieJar);
     }

Tests/TestHttpClient.php

@@ -23,7 +23,7 @@ class TestHttpClient extends HttpBrowser
     protected ?Response $nextResponse = null;
     protected string $nextScript;
 
-    public function __construct(array $server = [], History $history = null, CookieJar $cookieJar = null)
+    public function __construct(array $server = [], ?History $history = null, ?CookieJar $cookieJar = null)
     {
         $client = new MockHttpClient(function (string $method, string $url, array $options) {
             if (null === $this->nextResponse) {