Merge branch '5.4' into 6.3

* 5.4: 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
symfony · Jan 23, 2024 · b9dac8f · b9dac8f
2 parents 0cafa10 + b84e479
commit b9dac8f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Transport/MandrillApiTransport.php b/Transport/MandrillApiTransport.php
@@ -34,7 +34,7 @@ class MandrillApiTransport extends AbstractApiTransport
 
     private string $key;
 
-    public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null)
     {
         $this->key = $key;
 

diff --git a/Transport/MandrillHeadersTrait.php b/Transport/MandrillHeadersTrait.php
@@ -23,7 +23,7 @@
  */
 trait MandrillHeadersTrait
 {
-    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
+    public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage
     {
         if ($message instanceof Message) {
             $this->addMandrillHeaders($message);

diff --git a/Transport/MandrillHttpTransport.php b/Transport/MandrillHttpTransport.php
@@ -32,7 +32,7 @@ class MandrillHttpTransport extends AbstractHttpTransport
     private const HOST = 'mandrillapp.com';
     private string $key;
 
-    public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(string $key, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null)
     {
         $this->key = $key;
 

diff --git a/Transport/MandrillSmtpTransport.php b/Transport/MandrillSmtpTransport.php
@@ -22,7 +22,7 @@ class MandrillSmtpTransport extends EsmtpTransport
 {
     use MandrillHeadersTrait;
 
-    public function __construct(string $username, #[\SensitiveParameter] string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(string $username, #[\SensitiveParameter] string $password, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null)
     {
         parent::__construct('smtp.mandrillapp.com', 587, false, $dispatcher, $logger);