Merge branch '6.3' into 6.4

* 6.3: 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

Author: nicolas-grekas

TranslatableInterface.php

@@ -16,5 +16,5 @@
  */
 interface TranslatableInterface
 {
- public function trans(TranslatorInterface $translator, string $locale = null): string;
+ public function trans(TranslatorInterface $translator, ?string $locale = null): string;
 }

TranslatorInterface.php

@@ -59,7 +59,7 @@ interface TranslatorInterface
  *
  * @throws \InvalidArgumentException If the locale contains invalid characters
  */
- public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string;
+ public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string;
 
  /**
  * Returns the default locale.

TranslatorTrait.php

@@ -35,7 +35,7 @@ public function getLocale(): string
  return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
  }
 
- public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
+ public function trans(?string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
  {
  if (null === $id || '' === $id) {
  return '';