Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a20b219

Browse files
alexandre-dauboisnicolas-grekas
alexandre-daubois
authored and
nicolas-grekas
committed
[Mailer][Translation][Notifier] Remove some static occurrences that may cause unstable tests
1 parent a90a733 commit a20b219

File tree

24 files changed

+302
-290
lines changed

24 files changed

+302
-290
lines changed

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

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

1414
use AsyncAws\Core\Configuration;
1515
use AsyncAws\Ses\SesClient;
16+
use Psr\Log\NullLogger;
17+
use Symfony\Component\HttpClient\MockHttpClient;
1618
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiAsyncAwsTransport;
1719
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport;
1820
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesSmtpTransport;
@@ -23,9 +25,9 @@
2325

2426
class SesTransportFactoryTest extends TransportFactoryTestCase
2527
{
26-
public static function getFactory(): TransportFactoryInterface
28+
public function getFactory(): TransportFactoryInterface
2729
{
28-
return new SesTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
30+
return new SesTransportFactory(null, new MockHttpClient(), new NullLogger());
2931
}
3032

3133
public static function supportsProvider(): iterable
@@ -63,108 +65,107 @@ public static function supportsProvider(): iterable
6365

6466
public static function createProvider(): iterable
6567
{
66-
$client = self::getClient();
67-
$dispatcher = self::getDispatcher();
68-
$logger = self::getLogger();
68+
$client = new MockHttpClient();
69+
$logger = new NullLogger();
6970

7071
yield [
7172
new Dsn('ses+api', 'default', self::USER, self::PASSWORD),
72-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), $dispatcher, $logger),
73+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), null, $logger),
7374
];
7475

7576
yield [
7677
new Dsn('ses+api', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2']),
77-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), $dispatcher, $logger),
78+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), null, $logger),
7879
];
7980

8081
yield [
8182
new Dsn('ses+api', 'example.com', self::USER, self::PASSWORD, 8080),
82-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), $dispatcher, $logger),
83+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), null, $logger),
8384
];
8485

8586
yield [
8687
new Dsn('ses+api', 'default', self::USER, self::PASSWORD, null, ['session_token' => 'se$sion']),
87-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
88+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
8889
];
8990

9091
yield [
9192
new Dsn('ses+api', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2', 'session_token' => 'se$sion']),
92-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
93+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
9394
];
9495

9596
yield [
9697
new Dsn('ses+api', 'example.com', self::USER, self::PASSWORD, 8080, ['session_token' => 'se$sion']),
97-
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
98+
new SesApiAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
9899
];
99100

100101
yield [
101102
new Dsn('ses+https', 'default', self::USER, self::PASSWORD),
102-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), $dispatcher, $logger),
103+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), null, $logger),
103104
];
104105

105106
yield [
106107
new Dsn('ses', 'default', self::USER, self::PASSWORD),
107-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), $dispatcher, $logger),
108+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1']), null, $client, $logger), null, $logger),
108109
];
109110

110111
yield [
111112
new Dsn('ses+https', 'example.com', self::USER, self::PASSWORD, 8080),
112-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), $dispatcher, $logger),
113+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080']), null, $client, $logger), null, $logger),
113114
];
114115

115116
yield [
116117
new Dsn('ses+https', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2']),
117-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), $dispatcher, $logger),
118+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2']), null, $client, $logger), null, $logger),
118119
];
119120

120121
yield [
121122
new Dsn('ses+https', 'default', self::USER, self::PASSWORD, null, ['session_token' => 'se$sion']),
122-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
123+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
123124
];
124125

125126
yield [
126127
new Dsn('ses', 'default', self::USER, self::PASSWORD, null, ['session_token' => 'se$sion']),
127-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
128+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
128129
];
129130

130131
yield [
131132
new Dsn('ses+https', 'example.com', self::USER, self::PASSWORD, 8080, ['session_token' => 'se$sion']),
132-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
133+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-1', 'endpoint' => 'https://example.com:8080', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
133134
];
134135

135136
yield [
136137
new Dsn('ses+https', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-2', 'session_token' => 'se$sion']),
137-
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), $dispatcher, $logger),
138+
new SesHttpAsyncAwsTransport(new SesClient(Configuration::create(['accessKeyId' => self::USER, 'accessKeySecret' => self::PASSWORD, 'region' => 'eu-west-2', 'sessionToken' => 'se$sion']), null, $client, $logger), null, $logger),
138139
];
139140

140141
yield [
141142
new Dsn('ses+smtp', 'default', self::USER, self::PASSWORD),
142-
new SesSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
143+
new SesSmtpTransport(self::USER, self::PASSWORD, null, null, $logger),
143144
];
144145

145146
yield [
146147
new Dsn('ses+smtp', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
147-
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
148+
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger),
148149
];
149150

150151
yield [
151152
new Dsn('ses+smtps', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
152-
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
153+
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger),
153154
];
154155

155156
yield [
156157
new Dsn('ses+smtps', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1', 'ping_threshold' => '10']),
157-
(new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger))->setPingThreshold(10),
158+
(new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger))->setPingThreshold(10),
158159
];
159160

160161
yield [
161162
new Dsn('ses+smtp', 'custom.vpc.endpoint', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
162-
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger, 'custom.vpc.endpoint'),
163+
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger, 'custom.vpc.endpoint'),
163164
];
164165

165166
yield [
166167
new Dsn('ses+smtps', 'custom.vpc.endpoint', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
167-
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger, 'custom.vpc.endpoint'),
168+
new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', null, $logger, 'custom.vpc.endpoint'),
168169
];
169170
}
170171

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\Mailer\Bridge\Google\Tests\Transport;
1313

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\Google\Transport\GmailSmtpTransport;
1517
use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
1618
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
@@ -19,9 +21,9 @@
1921

2022
class GmailTransportFactoryTest extends TransportFactoryTestCase
2123
{
22-
public static function getFactory(): TransportFactoryInterface
24+
public function getFactory(): TransportFactoryInterface
2325
{
24-
return new GmailTransportFactory(self::getDispatcher(), null, self::getLogger());
26+
return new GmailTransportFactory(null, new MockHttpClient(), new NullLogger());
2527
}
2628

2729
public static function supportsProvider(): iterable
@@ -51,17 +53,17 @@ public static function createProvider(): iterable
5153
{
5254
yield [
5355
new Dsn('gmail', 'default', self::USER, self::PASSWORD),
54-
new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
56+
new GmailSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
5557
];
5658

5759
yield [
5860
new Dsn('gmail+smtp', 'default', self::USER, self::PASSWORD),
59-
new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
61+
new GmailSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
6062
];
6163

6264
yield [
6365
new Dsn('gmail+smtps', 'default', self::USER, self::PASSWORD),
64-
new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
66+
new GmailSmtpTransport(self::USER, self::PASSWORD, null, new NullLogger()),
6567
];
6668
}
6769

‎src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportFactoryTest.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\Mailer\Bridge\Infobip\Tests\Transport;
1313

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipApiTransport;
1517
use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipSmtpTransport;
1618
use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory;
@@ -20,9 +22,9 @@
2022

2123
class InfobipApiTransportFactoryTest extends TransportFactoryTestCase
2224
{
23-
public static function getFactory(): TransportFactoryInterface
25+
public function getFactory(): TransportFactoryInterface
2426
{
25-
return new InfobipTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
27+
return new InfobipTransportFactory(null, new MockHttpClient(), new NullLogger());
2628
}
2729

2830
public static function supportsProvider(): iterable
@@ -55,27 +57,26 @@ public static function supportsProvider(): iterable
5557

5658
public static function createProvider(): iterable
5759
{
58-
$dispatcher = self::getDispatcher();
59-
$logger = self::getLogger();
60+
$logger = new NullLogger();
6061

6162
yield [
6263
new Dsn('infobip+api', 'example.com', self::PASSWORD),
63-
(new InfobipApiTransport(self::PASSWORD, self::getClient(), $dispatcher, $logger))->setHost('example.com'),
64+
(new InfobipApiTransport(self::PASSWORD, new MockHttpClient(), null, $logger))->setHost('example.com'),
6465
];
6566

6667
yield [
6768
new Dsn('infobip', 'default', self::PASSWORD),
68-
new InfobipSmtpTransport(self::PASSWORD, $dispatcher, $logger),
69+
new InfobipSmtpTransport(self::PASSWORD, null, $logger),
6970
];
7071

7172
yield [
7273
new Dsn('infobip+smtp', 'default', self::PASSWORD),
73-
new InfobipSmtpTransport(self::PASSWORD, $dispatcher, $logger),
74+
new InfobipSmtpTransport(self::PASSWORD, null, $logger),
7475
];
7576

7677
yield [
7778
new Dsn('infobip+smtps', 'default', self::PASSWORD),
78-
new InfobipSmtpTransport(self::PASSWORD, $dispatcher, $logger),
79+
new InfobipSmtpTransport(self::PASSWORD, null, $logger),
7980
];
8081
}
8182

‎src/Symfony/Component/Mailer/Bridge/MailPace/Tests/Transport/MailPaceTransportFactoryTest.php

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Component\Mailer\Bridge\MailPace\Tests\Transport;
1313

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceApiTransport;
1517
use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceSmtpTransport;
1618
use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
@@ -20,9 +22,9 @@
2022

2123
final class MailPaceTransportFactoryTest extends TransportFactoryTestCase
2224
{
23-
public static function getFactory(): TransportFactoryInterface
25+
public function getFactory(): TransportFactoryInterface
2426
{
25-
return new MailPaceTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
27+
return new MailPaceTransportFactory(null, new MockHttpClient(), new NullLogger());
2628
}
2729

2830
public static function supportsProvider(): iterable
@@ -55,32 +57,31 @@ public static function supportsProvider(): iterable
5557

5658
public static function createProvider(): iterable
5759
{
58-
$dispatcher = self::getDispatcher();
59-
$logger = self::getLogger();
60+
$logger = new NullLogger();
6061

6162
yield [
6263
new Dsn('mailpace+api', 'default', self::USER),
63-
new MailPaceApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
64+
new MailPaceApiTransport(self::USER, new MockHttpClient(), null, $logger),
6465
];
6566

6667
yield [
6768
new Dsn('mailpace+api', 'example.com', self::USER, '', 8080),
68-
(new MailPaceApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
69+
(new MailPaceApiTransport(self::USER, new MockHttpClient(), null, $logger))->setHost('example.com')->setPort(8080),
6970
];
7071

7172
yield [
7273
new Dsn('mailpace', 'default', self::USER),
73-
new MailPaceSmtpTransport(self::USER, $dispatcher, $logger),
74+
new MailPaceSmtpTransport(self::USER, null, $logger),
7475
];
7576

7677
yield [
7778
new Dsn('mailpace+smtp', 'default', self::USER),
78-
new MailPaceSmtpTransport(self::USER, $dispatcher, $logger),
79+
new MailPaceSmtpTransport(self::USER, null, $logger),
7980
];
8081

8182
yield [
8283
new Dsn('mailpace+smtps', 'default', self::USER),
83-
new MailPaceSmtpTransport(self::USER, $dispatcher, $logger),
84+
new MailPaceSmtpTransport(self::USER, null, $logger),
8485
];
8586
}
8687

0 commit comments

Comments
 (0)