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
1 parent 1166cd7 commit f86afe2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions BrevoTransport.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ final class BrevoTransport extends AbstractTransport
public function __construct(
#[\SensitiveParameter] private readonly string $apiKey,
private readonly string $sender,
HttpClientInterface $client = null,
EventDispatcherInterface $dispatcher = null
?HttpClientInterface $client = null,
?EventDispatcherInterface $dispatcher = null
) {
parent::__construct($client, $dispatcher);
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/BrevoTransportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

final class BrevoTransportTest extends TransportTestCase
{
public static function createTransport(HttpClientInterface $client = null): BrevoTransport
public static function createTransport(?HttpClientInterface $client = null): BrevoTransport
{
return (new BrevoTransport('api-key', '0611223344', $client ?? new MockHttpClient()))->setHost('host.test');
}
Expand Down

0 comments on commit f86afe2

Please sign in to comment.