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
fwm · Jan 23, 2024 · 24717c0 · 24717c0
2 parents 58932ea + 910a1c8
commit 24717c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Transport/SendgridApiTransport.php b/Transport/SendgridApiTransport.php
@@ -36,7 +36,7 @@ class SendgridApiTransport 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/SendgridSmtpTransport.php b/Transport/SendgridSmtpTransport.php
@@ -20,7 +20,7 @@
  */
 class SendgridSmtpTransport extends EsmtpTransport
 {
- public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+ public function __construct(string $key, ?EventDispatcherInterface $dispatcher = null, ?LoggerInterface $logger = null)
  {
  parent::__construct('smtp.sendgrid.net', 465, true, $dispatcher, $logger);