Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit abdb690d3b6e · 2024-01-23T15:51:35.000+01:00
* 6.3:
  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
diff --git a/SmscTransport.php b/SmscTransport.php
@@ -34,7 +34,7 @@ final class SmscTransport extends AbstractTransport
     private ?string $password;
     private string $from;
 
-    public function __construct(string $login, #[\SensitiveParameter] string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(string $login, #[\SensitiveParameter] string $password, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
     {
         $this->login = $login;
         $this->password = $password;
diff --git a/Tests/SmscTransportTest.php b/Tests/SmscTransportTest.php
@@ -21,7 +21,7 @@
 
 final class SmscTransportTest extends TransportTestCase
 {
-    public static function createTransport(HttpClientInterface $client = null): SmscTransport
+    public static function createTransport(?HttpClientInterface $client = null): SmscTransport
     {
         return new SmscTransport('login', 'password', 'MyApp', $client ?? new MockHttpClient());
     }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ final class SmscTransport extends AbstractTransport`
`34`	`34`	`private ?string $password;`
`35`	`35`	`private string $from;`
`36`	`36`
`37`		`- public function __construct(string $login, #[\SensitiveParameter] string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)`
	`37`	`+ public function __construct(string $login, #[\SensitiveParameter] string $password, string $from, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)`
`38`	`38`	`{`
`39`	`39`	`$this->login = $login;`
`40`	`40`	`$this->password = $password;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`final class SmscTransportTest extends TransportTestCase`
`23`	`23`	`{`
`24`		`- public static function createTransport(HttpClientInterface $client = null): SmscTransport`
	`24`	`+ public static function createTransport(?HttpClientInterface $client = null): SmscTransport`
`25`	`25`	`{`
`26`	`26`	`return new SmscTransport('login', 'password', 'MyApp', $client ?? new MockHttpClient());`
`27`	`27`	`}`