Skip to content

Commit c444a43

Browse files
alexandre-dauboisnicolas-grekas
alexandre-daubois
authored and
nicolas-grekas
committed
[Translation][Mailer] Convert $this calls to static ones in data providers
1 parent 77c8444 commit c444a43

File tree

25 files changed

+200
-212
lines changed

25 files changed

+200
-212
lines changed

‎UPGRADE-5.4.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ Lock
6666
Mailer
6767
------
6868

69-
* The following data providers for `TransportFactoryTestCase` are now static:
70-
`supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
71-
* The following data providers for `TransportTestCase` are now static:
72-
`toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
69+
* The following data providers for `TransportFactoryTestCase` are now static: `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
70+
* The following data providers for `TransportTestCase` are now static: `toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
7371

7472
Messenger
7573
---------
@@ -210,6 +208,5 @@ Security
210208
Translation
211209
-----------
212210

213-
* The following data providers for `ProviderFactoryTestCase` are now static:
214-
`supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
211+
* The following data providers for `ProviderFactoryTestCase` are now static: `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
215212
* `ProviderTestCase::toStringProvider()` is now static

‎src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
class SesTransportFactoryTest extends TransportFactoryTestCase
2525
{
26-
public function getFactory(): TransportFactoryInterface
26+
public static function getFactory(): TransportFactoryInterface
2727
{
28-
return new SesTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
28+
return new SesTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2929
}
3030

3131
public static function supportsProvider(): iterable
@@ -63,9 +63,9 @@ public static function supportsProvider(): iterable
6363

6464
public static function createProvider(): iterable
6565
{
66-
$client = $this->getClient();
67-
$dispatcher = $this->getDispatcher();
68-
$logger = $this->getLogger();
66+
$client = self::getClient();
67+
$dispatcher = self::getDispatcher();
68+
$logger = self::getLogger();
6969

7070
yield [
7171
new Dsn('ses+api', 'default', self::USER, self::PASSWORD),

‎src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
class GmailTransportFactoryTest extends TransportFactoryTestCase
2121
{
22-
public function getFactory(): TransportFactoryInterface
22+
public static function getFactory(): TransportFactoryInterface
2323
{
24-
return new GmailTransportFactory($this->getDispatcher(), null, $this->getLogger());
24+
return new GmailTransportFactory(self::getDispatcher(), null, self::getLogger());
2525
}
2626

2727
public static function supportsProvider(): iterable
@@ -51,17 +51,17 @@ public static function createProvider(): iterable
5151
{
5252
yield [
5353
new Dsn('gmail', 'default', self::USER, self::PASSWORD),
54-
new GmailSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
54+
new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
5555
];
5656

5757
yield [
5858
new Dsn('gmail+smtp', 'default', self::USER, self::PASSWORD),
59-
new GmailSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
59+
new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
6060
];
6161

6262
yield [
6363
new Dsn('gmail+smtps', 'default', self::USER, self::PASSWORD),
64-
new GmailSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
64+
new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
6565
];
6666
}
6767

‎src/Symfony/Component/Mailer/Bridge/Google/composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
"psr/event-dispatcher": "^1",
2121
"symfony/mailer": "^5.4.21|^6.2.7"
2222
},
23+
"require-dev": {
24+
"symfony/http-client": "^4.4|^5.0|^6.0"
25+
},
2326
"autoload": {
2427
"psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Google\\": "" },
2528
"exclude-from-classmap": [

‎src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
class MandrillTransportFactoryTest extends TransportFactoryTestCase
2323
{
24-
public function getFactory(): TransportFactoryInterface
24+
public static function getFactory(): TransportFactoryInterface
2525
{
26-
return new MandrillTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
26+
return new MandrillTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2727
}
2828

2929
public static function supportsProvider(): iterable
@@ -61,9 +61,9 @@ public static function supportsProvider(): iterable
6161

6262
public static function createProvider(): iterable
6363
{
64-
$client = $this->getClient();
65-
$dispatcher = $this->getDispatcher();
66-
$logger = $this->getLogger();
64+
$client = self::getClient();
65+
$dispatcher = self::getDispatcher();
66+
$logger = self::getLogger();
6767

6868
yield [
6969
new Dsn('mandrill+api', 'default', self::USER),

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
class MailgunTransportFactoryTest extends TransportFactoryTestCase
2323
{
24-
public function getFactory(): TransportFactoryInterface
24+
public static function getFactory(): TransportFactoryInterface
2525
{
26-
return new MailgunTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
26+
return new MailgunTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2727
}
2828

2929
public static function supportsProvider(): iterable
@@ -61,9 +61,9 @@ public static function supportsProvider(): iterable
6161

6262
public static function createProvider(): iterable
6363
{
64-
$client = $this->getClient();
65-
$dispatcher = $this->getDispatcher();
66-
$logger = $this->getLogger();
64+
$client = self::getClient();
65+
$dispatcher = self::getDispatcher();
66+
$logger = self::getLogger();
6767

6868
yield [
6969
new Dsn('mailgun+api', 'default', self::USER, self::PASSWORD),

‎src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetTransportFactoryTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
class MailjetTransportFactoryTest extends TransportFactoryTestCase
2222
{
23-
public function getFactory(): TransportFactoryInterface
23+
public static function getFactory(): TransportFactoryInterface
2424
{
25-
return new MailjetTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
25+
return new MailjetTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2626
}
2727

2828
public static function supportsProvider(): iterable
@@ -55,17 +55,17 @@ public static function supportsProvider(): iterable
5555

5656
public static function createProvider(): iterable
5757
{
58-
$dispatcher = $this->getDispatcher();
59-
$logger = $this->getLogger();
58+
$dispatcher = self::getDispatcher();
59+
$logger = self::getLogger();
6060

6161
yield [
6262
new Dsn('mailjet+api', 'default', self::USER, self::PASSWORD),
63-
new MailjetApiTransport(self::USER, self::PASSWORD, $this->getClient(), $dispatcher, $logger),
63+
new MailjetApiTransport(self::USER, self::PASSWORD, self::getClient(), $dispatcher, $logger),
6464
];
6565

6666
yield [
6767
new Dsn('mailjet+api', 'example.com', self::USER, self::PASSWORD),
68-
(new MailjetApiTransport(self::USER, self::PASSWORD, $this->getClient(), $dispatcher, $logger))->setHost('example.com'),
68+
(new MailjetApiTransport(self::USER, self::PASSWORD, self::getClient(), $dispatcher, $logger))->setHost('example.com'),
6969
];
7070

7171
yield [

‎src/Symfony/Component/Mailer/Bridge/OhMySmtp/Tests/Transport/OhMySmtpTransportFactoryTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
final class OhMySmtpTransportFactoryTest extends TransportFactoryTestCase
2222
{
23-
public function getFactory(): TransportFactoryInterface
23+
public static function getFactory(): TransportFactoryInterface
2424
{
25-
return new OhMySmtpTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
25+
return new OhMySmtpTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2626
}
2727

2828
public static function supportsProvider(): iterable
@@ -55,17 +55,17 @@ public static function supportsProvider(): iterable
5555

5656
public static function createProvider(): iterable
5757
{
58-
$dispatcher = $this->getDispatcher();
59-
$logger = $this->getLogger();
58+
$dispatcher = self::getDispatcher();
59+
$logger = self::getLogger();
6060

6161
yield [
6262
new Dsn('ohmysmtp+api', 'default', self::USER),
63-
new OhMySmtpApiTransport(self::USER, $this->getClient(), $dispatcher, $logger),
63+
new OhMySmtpApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
6464
];
6565

6666
yield [
6767
new Dsn('ohmysmtp+api', 'example.com', self::USER, '', 8080),
68-
(new OhMySmtpApiTransport(self::USER, $this->getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
68+
(new OhMySmtpApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
6969
];
7070

7171
yield [

‎src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
class PostmarkTransportFactoryTest extends TransportFactoryTestCase
2222
{
23-
public function getFactory(): TransportFactoryInterface
23+
public static function getFactory(): TransportFactoryInterface
2424
{
25-
return new PostmarkTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
25+
return new PostmarkTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2626
}
2727

2828
public static function supportsProvider(): iterable
@@ -55,22 +55,22 @@ public static function supportsProvider(): iterable
5555

5656
public static function createProvider(): iterable
5757
{
58-
$dispatcher = $this->getDispatcher();
59-
$logger = $this->getLogger();
58+
$dispatcher = self::getDispatcher();
59+
$logger = self::getLogger();
6060

6161
yield [
6262
new Dsn('postmark+api', 'default', self::USER),
63-
new PostmarkApiTransport(self::USER, $this->getClient(), $dispatcher, $logger),
63+
new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
6464
];
6565

6666
yield [
6767
new Dsn('postmark+api', 'example.com', self::USER, '', 8080),
68-
(new PostmarkApiTransport(self::USER, $this->getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
68+
(new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
6969
];
7070

7171
yield [
7272
new Dsn('postmark+api', 'example.com', self::USER, '', 8080, ['message_stream' => 'broadcasts']),
73-
(new PostmarkApiTransport(self::USER, $this->getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080)->setMessageStream('broadcasts'),
73+
(new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080)->setMessageStream('broadcasts'),
7474
];
7575

7676
yield [

‎src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
class SendgridTransportFactoryTest extends TransportFactoryTestCase
2222
{
23-
public function getFactory(): TransportFactoryInterface
23+
public static function getFactory(): TransportFactoryInterface
2424
{
25-
return new SendgridTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
25+
return new SendgridTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2626
}
2727

2828
public static function supportsProvider(): iterable
@@ -55,17 +55,17 @@ public static function supportsProvider(): iterable
5555

5656
public static function createProvider(): iterable
5757
{
58-
$dispatcher = $this->getDispatcher();
59-
$logger = $this->getLogger();
58+
$dispatcher = self::getDispatcher();
59+
$logger = self::getLogger();
6060

6161
yield [
6262
new Dsn('sendgrid+api', 'default', self::USER),
63-
new SendgridApiTransport(self::USER, $this->getClient(), $dispatcher, $logger),
63+
new SendgridApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
6464
];
6565

6666
yield [
6767
new Dsn('sendgrid+api', 'example.com', self::USER, '', 8080),
68-
(new SendgridApiTransport(self::USER, $this->getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
68+
(new SendgridApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
6969
];
7070

7171
yield [

‎src/Symfony/Component/Mailer/Bridge/Sendinblue/Tests/Transport/SendinblueTransportFactoryTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
class SendinblueTransportFactoryTest extends TransportFactoryTestCase
2222
{
23-
public function getFactory(): TransportFactoryInterface
23+
public static function getFactory(): TransportFactoryInterface
2424
{
25-
return new SendinblueTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
25+
return new SendinblueTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
2626
}
2727

2828
public static function supportsProvider(): iterable
@@ -52,22 +52,22 @@ public static function createProvider(): iterable
5252
{
5353
yield [
5454
new Dsn('sendinblue', 'default', self::USER, self::PASSWORD),
55-
new SendinblueSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
55+
new SendinblueSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
5656
];
5757

5858
yield [
5959
new Dsn('sendinblue+smtp', 'default', self::USER, self::PASSWORD),
60-
new SendinblueSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
60+
new SendinblueSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
6161
];
6262

6363
yield [
6464
new Dsn('sendinblue+smtp', 'default', self::USER, self::PASSWORD, 465),
65-
new SendinblueSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
65+
new SendinblueSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
6666
];
6767

6868
yield [
6969
new Dsn('sendinblue+api', 'default', self::USER),
70-
new SendinblueApiTransport(self::USER, $this->getClient(), $this->getDispatcher(), $this->getLogger()),
70+
new SendinblueApiTransport(self::USER, self::getClient(), self::getDispatcher(), self::getLogger()),
7171
];
7272
}
7373

‎src/Symfony/Component/Mailer/Bridge/Sendinblue/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"require": {
1919
"php": ">=7.2.5",
2020
"psr/event-dispatcher": "^1",
21-
"symfony/mailer": "^5.1|^6.0"
21+
"symfony/mailer": "^5.4.21|^6.2.7"
2222
},
2323
"require-dev": {
24-
"symfony/mailer": "^5.4.21|^6.2.7"
24+
"symfony/http-client": "^4.4|^5.0|^6.0"
2525
},
2626
"autoload": {
2727
"psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Sendinblue\\": "" },

‎src/Symfony/Component/Mailer/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ CHANGELOG
44
5.4.21
55
------
66

7-
* [BC BREAK] The following data providers for `TransportFactoryTestCase` are now static:
7+
* [BC BREAK] The following data providers for `TransportFactoryTestCase` are now static:
88
`supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
9-
* [BC BREAK] The following data providers for `TransportTestCase` are now static:
9+
* [BC BREAK] The following data providers for `TransportTestCase` are now static:
1010
`toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
1111

1212
5.4

‎src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Psr\Log\LoggerInterface;
16+
use Psr\Log\NullLogger;
17+
use Symfony\Component\HttpClient\MockHttpClient;
1618
use Symfony\Component\Mailer\Exception\IncompleteDsnException;
1719
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
1820
use Symfony\Component\Mailer\Transport\Dsn;
@@ -31,11 +33,11 @@ abstract class TransportFactoryTestCase extends TestCase
3133
protected const USER = 'u$er';
3234
protected const PASSWORD = 'pa$s';
3335

34-
protected $dispatcher;
35-
protected $client;
36-
protected $logger;
36+
protected static $dispatcher;
37+
protected static $client;
38+
protected static $logger;
3739

38-
abstract public function getFactory(): TransportFactoryInterface;
40+
abstract public static function getFactory(): TransportFactoryInterface;
3941

4042
abstract public static function supportsProvider(): iterable;
4143

@@ -100,18 +102,22 @@ public function testIncompleteDsnException(Dsn $dsn)
100102
$factory->create($dsn);
101103
}
102104

103-
protected function getDispatcher(): EventDispatcherInterface
105+
protected static function getDispatcher(): EventDispatcherInterface
104106
{
105-
return $this->dispatcher ?? $this->dispatcher = $this->createMock(EventDispatcherInterface::class);
107+
return self::$dispatcher ?? self::$dispatcher = new class() implements EventDispatcherInterface {
108+
public function dispatch($event, string $eventName = null): object
109+
{
110+
}
111+
};
106112
}
107113

108-
protected function getClient(): HttpClientInterface
114+
protected static function getClient(): HttpClientInterface
109115
{
110-
return $this->client ?? $this->client = $this->createMock(HttpClientInterface::class);
116+
return self::$client ?? self::$client = new MockHttpClient();
111117
}
112118

113-
protected function getLogger(): LoggerInterface
119+
protected static function getLogger(): LoggerInterface
114120
{
115-
return $this->logger ?? $this->logger = $this->createMock(LoggerInterface::class);
121+
return self::$logger ?? self::$logger = new NullLogger();
116122
}
117123
}

0 commit comments

Comments
 (0)