Skip to content

Commit

Permalink
Merge branch '7.0' into 7.1
Browse files Browse the repository at this point in the history
* 7.0:
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  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
  [Messenger][AmazonSqs] Allow async-aws/sqs version 2
  • Loading branch information
nicolas-grekas committed Jan 23, 2024
2 parents b05e1d8 + f9baf75 commit d025ba0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions PlivoTransport.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public function __construct(
private readonly string $authId,
#[\SensitiveParameter] private readonly string $authToken,
private readonly string $from,
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/PlivoTransportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

final class PlivoTransportTest extends TransportTestCase
{
public static function createTransport(HttpClientInterface $client = null, string $from = 'from'): PlivoTransport
public static function createTransport(?HttpClientInterface $client = null, string $from = 'from'): PlivoTransport
{
return new PlivoTransport('authId', 'authToken', $from, $client ?? new MockHttpClient());
}
Expand Down

0 comments on commit d025ba0

Please sign in to comment.