Skip to content

Commit

Permalink
Merge branch '5.4' into 6.2
Browse files Browse the repository at this point in the history
* 5.4:
  [Translation][Mailer] Convert `$this` calls to static ones in data providers
  [BC Break] Make data providers for abstract test cases static
  use TestCase suffix for abstract tests in Tests directories
  Fix Request locale property doc types
  Bump absolute lowest dep to 4.4
  • Loading branch information
nicolas-grekas committed Feb 17, 2023
2 parents 5657da2 + 4b3d77d commit 74d7ea9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions Tests/Transport/MailgunTransportFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

class MailgunTransportFactoryTest extends TransportFactoryTestCase
{
public function getFactory(): TransportFactoryInterface
public static function getFactory(): TransportFactoryInterface
{
return new MailgunTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
return new MailgunTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
}

public function supportsProvider(): iterable
public static function supportsProvider(): iterable
{
yield [
new Dsn('mailgun+api', 'default'),
Expand Down Expand Up @@ -59,11 +59,11 @@ public function supportsProvider(): iterable
];
}

public function createProvider(): iterable
public static function createProvider(): iterable
{
$client = $this->getClient();
$dispatcher = $this->getDispatcher();
$logger = $this->getLogger();
$client = self::getClient();
$dispatcher = self::getDispatcher();
$logger = self::getLogger();

yield [
new Dsn('mailgun+api', 'default', self::USER, self::PASSWORD),
Expand Down Expand Up @@ -106,15 +106,15 @@ public function createProvider(): iterable
];
}

public function unsupportedSchemeProvider(): iterable
public static function unsupportedSchemeProvider(): iterable
{
yield [
new Dsn('mailgun+foo', 'default', self::USER, self::PASSWORD),
'The "mailgun+foo" scheme is not supported; supported schemes for mailer "mailgun" are: "mailgun", "mailgun+api", "mailgun+https", "mailgun+smtp", "mailgun+smtps".',
];
}

public function incompleteDsnProvider(): iterable
public static function incompleteDsnProvider(): iterable
{
yield [new Dsn('mailgun+api', 'default', self::USER)];

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.1",
"symfony/mailer": "^5.4|^6.0"
"symfony/mailer": "^5.4.21|^6.2.7"
},
"require-dev": {
"symfony/http-client": "^5.4|^6.0"
Expand Down

0 comments on commit 74d7ea9

Please sign in to comment.