From 8ad6541e8e61f0c58cef5ff36758fbf04043b20d Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 23 Jan 2024 15:32:00 +0100
Subject: [PATCH] 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
---
 PlivoTransport.php           | 4 ++--
 Tests/PlivoTransportTest.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PlivoTransport.php b/PlivoTransport.php
index 0f382ef..bc1796b 100644
--- a/PlivoTransport.php
+++ b/PlivoTransport.php
@@ -34,8 +34,8 @@ public function __construct(
         private readonly string $authId,
         #[\SensitiveParameter] private readonly string $authToken,
         private readonly string $from,
-        HttpClientInterface $client = null,
-        EventDispatcherInterface $dispatcher = null
+        ?HttpClientInterface $client = null,
+        ?EventDispatcherInterface $dispatcher = null
     ) {
         parent::__construct($client, $dispatcher);
     }
diff --git a/Tests/PlivoTransportTest.php b/Tests/PlivoTransportTest.php
index 1174e8d..07b7c41 100644
--- a/Tests/PlivoTransportTest.php
+++ b/Tests/PlivoTransportTest.php
@@ -24,7 +24,7 @@
 
 final class PlivoTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null, string $from = 'from'): PlivoTransport
+    public static function createTransport(?HttpClientInterface $client = null, string $from = 'from'): PlivoTransport
     {
         return new PlivoTransport('authId', 'authToken', $from, $client ?? new MockHttpClient());
     }