Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 8965bcd047f6 · 2024-01-23T15:35:58.000+01:00
* 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
diff --git a/MessageMediaTransport.php b/MessageMediaTransport.php
@@ -33,7 +33,7 @@ final class MessageMediaTransport extends AbstractTransport
     private string $apiSecret;
     private ?string $from;
 
-    public function __construct(string $apiKey, #[\SensitiveParameter] string $apiSecret, string $from = null, HttpClientInterface $client = null, EventDiserInterface $diser = null)
+    public function __construct(string $apiKey, #[\SensitiveParameter] string $apiSecret, ?string $from = null, ?HttpClientInterface $client = null, ?EventDiserInterface $diser = null)
     {
         $this->apiKey = $apiKey;
         $this->apiSecret = $apiSecret;
diff --git a/Tests/MessageMediaTransportTest.php b/Tests/MessageMediaTransportTest.php
@@ -25,7 +25,7 @@
 
 final class MessageMediaTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null, string $from = null): MessageMediaTransport
+    public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): MessageMediaTransport
     {
         return new MessageMediaTransport('apiKey', 'apiSecret', $from, $client ?? new MockHttpClient());
     }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ final class MessageMediaTransport extends AbstractTransport`
`33`	`33`	`private string $apiSecret;`
`34`	`34`	`private ?string $from;`
`35`	`35`
`36`		`-public function __construct(string $apiKey, #[\SensitiveParameter] string $apiSecret, string $from = null, HttpClientInterface $client = null, EventDiserInterface $diser = null)`
	`36`	`+public function __construct(string $apiKey, #[\SensitiveParameter] string $apiSecret, ?string $from = null, ?HttpClientInterface $client = null, ?EventDiserInterface $diser = null)`
`37`	`37`	`{`
`38`	`38`	`$this->apiKey = $apiKey;`
`39`	`39`	`$this->apiSecret = $apiSecret;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`final class MessageMediaTransportTest extends TransportTestCase`
`27`	`27`	`{`
`28`		`-public static function createTransport(HttpClientInterface $client = null, string $from = null): MessageMediaTransport`
	`28`	`+public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): MessageMediaTransport`
`29`	`29`	`{`
`30`	`30`	`return new MessageMediaTransport('apiKey', 'apiSecret', $from, $client ?? new MockHttpClient());`
`31`	`31`	`}`