Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Jan 23, 2024
2 parents a8b365b + 543e932 commit e763a60
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion SendinblueTransport.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ final class SendinblueTransport extends AbstractTransport
private string $apiKey;
private string $sender;

public function __construct(#[\SensitiveParameter] string $apiKey, string $sender, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
public function __construct(#[\SensitiveParameter] string $apiKey, string $sender, ?HttpClientInterface $client = null, ?EventDispatcherInterface $dispatcher = null)
{
$this->apiKey = $apiKey;
$this->sender = $sender;
Expand Down
2 changes: 1 addition & 1 deletion Tests/SendinblueTransportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/
final class SendinblueTransportTest extends TransportTestCase
{
public static function createTransport(HttpClientInterface $client = null): SendinblueTransport
public static function createTransport(?HttpClientInterface $client = null): SendinblueTransport
{
return (new SendinblueTransport('api-key', '0611223344', $client ?? new MockHttpClient()))->setHost('host.test');
}
Expand Down

0 comments on commit e763a60

Please sign in to comment.