Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 713d1bb7189e · 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/ClickatellTransport.php b/ClickatellTransport.php
@@ -31,7 +31,7 @@ final class ClickatellTransport extends AbstractTransport
     private string $authToken;
     private ?string $from;
 
-    public function __construct(#[\SensitiveParameter] string $authToken, string $from = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(#[\SensitiveParameter] string $authToken, ?string $from = null, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->authToken = $authToken;
         $this->from = $from;
diff --git a/Tests/ClickatellTransportTest.php b/Tests/ClickatellTransportTest.php
@@ -25,7 +25,7 @@
 
 final class ClickatellTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null, string $from = null): ClickatellTransport
+    public static function createTransport(?HttpClientInterface $client = null, ?string $from = null): ClickatellTransport
     {
         return new ClickatellTransport('authToken', $from, $client ?? new MockHttpClient());
     }

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