Merge branch '6.4' into 7.0

xabbuh · xabbuh · commit d5db6599775a · 2024-03-28T10:20:36.000+01:00
* 6.4:
  stop marking parameters implicitly as nullable
  include message id provided by the MTA when dispatching the SentMessageEvent
diff --git a/Tests/Fixtures/TranslatableTextAlign.php b/Tests/Fixtures/TranslatableTextAlign.php
@@ -20,7 +20,7 @@ enum TranslatableTextAlign implements TranslatableInterface
     case Center;
     case Right;
 
-    public function trans(TranslatorInterface $translator, string $locale = null): string
+    public function trans(TranslatorInterface $translator, ?string $locale = null): string
     {
         return $translator->trans($this->name, locale: $locale);
     }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ enum TranslatableTextAlign implements TranslatableInterface`
`20`	`20`	`case Center;`
`21`	`21`	`case Right;`
`22`	`22`
`23`		`- public function trans(TranslatorInterface $translator, string $locale = null): string`
	`23`	`+ public function trans(TranslatorInterface $translator, ?string $locale = null): string`
`24`	`24`	`{`
`25`	`25`	`return $translator->trans($this->name, locale: $locale);`
`26`	`26`	`}`