8000 [Mailer][Translation][Notifier] Remove some `static` occurrences that… · symfony/symfony@872abc6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 872abc6

Browse files
alexandre-dauboisalexandre-daubois
committed
[Mailer][Translation][Notifier] Remove some static occurrences that may cause unstable tests
1 parent ac1fcce commit 872abc6

File tree

32 files changed

+318
-233
lines changed

32 files changed

+318
-233
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@
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;
1921
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
22+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
2023
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
2124
use Symfony\Component\Mailer\Transport\Dsn;
2225
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -25,7 +28,7 @@ class SesTransportFactoryTest extends TransportFactoryTestCase
2528
{
2629
public static function getFactory(): TransportFactoryInterface
2730
{
28-
return new SesTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
31+
return new SesTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2932
}
3033

3134
public static function supportsProvider(): iterable
@@ -63,9 +66,9 @@ public static function supportsProvider(): iterable
6366

6467
public static function createProvider(): iterable
6568
{
66-
$client = self::getClient();
67-
$dispatcher = self::getDispatcher();
68-
$logger = self::getLogger();
69+
$client = new MockHttpClient();
70+
$dispatcher = new DummyEventDispatcher();
71+
$logger = new NullLogger();
6972

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

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

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

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

14+
use Psr\Log\NullLogger;
1415
use Symfony\Component\Mailer\Bridge\Google\Transport\GmailSmtpTransport;
1516
use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
17+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1618
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1719
use Symfony\Component\Mailer\Transport\Dsn;
1820
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -21,7 +23,7 @@ class GmailTransportFactoryTest extends TransportFactoryTestCase
2123
{
2224
public static function getFactory(): TransportFactoryInterface
2325
{
24-
return new GmailTransportFactory(self::getDispatcher(), null, self::getLogger());
26+
return new GmailTransportFactory(new DummyEventDispatcher(), null, 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, new DummyEventDispatcher(), 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, new DummyEventDispatcher(), 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, new DummyEventDispatcher(), new NullLogger()),
6567
];
6668
}
6769

‎src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTranspo 179B rtFactoryTest.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
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;
19+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1720
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1821
use Symfony\Component\Mailer\Transport\Dsn;
1922
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -22,7 +25,7 @@ class InfobipApiTransportFactoryTest extends TransportFactoryTestCase
2225
{
2326
public static function getFactory(): TransportFactoryInterface
2427
{
25-
return new InfobipTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
28+
return new InfobipTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2629
}
2730

2831
public static function supportsProvider(): iterable
@@ -55,12 +58,12 @@ public static function supportsProvider(): iterable
5558

5659
public static function createProvider(): iterable
5760
{
58-
$dispatcher = self::getDispatcher();
59-
$logger = self::getLogger();
61+
$dispatcher = new DummyEventDispatcher();
62+
$logger = new NullLogger();
6063

6164
yield [
6265
new Dsn('infobip+api', 'example.com', self::PASSWORD),
63-
(new InfobipApiTransport(self::PASSWORD, self::getClient(), $dispatcher, $logger))->setHost('example.com'),
66+
(new InfobipApiTransport(self::PASSWORD, new MockHttpClient(), $dispatcher, $logger))->setHost('example.com'),
6467
];
6568

6669
yield [

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
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;
19+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1720
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1821
use Symfony\Component\Mailer\Transport\Dsn;
1922
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -22,7 +25,7 @@ final class MailPaceTransportFactoryTest extends TransportFactoryTestCase
2225
{
2326
public static function getFactory(): TransportFactoryInterface
2427
{
25-
return new MailPaceTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
28+
return new MailPaceTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2629
}
2730

2831
public static function supportsProvider(): iterable
@@ -55,17 +58,17 @@ public static function supportsProvider(): iterable
5558

5659
public static function createProvider(): iterable
5760
{
58-
$dispatcher = self::getDispatcher();
59-
$logger = self::getLogger();
61+
$dispatcher = new DummyEventDispatcher();
62+
$logger = new NullLogger();
6063

6164
yield [
6265
new Dsn('mailpace+api', 'default', self::USER),
63-
new MailPaceApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
66+
new MailPaceApiTransport(self::USER, new MockHttpClient(), $dispatcher, $logger),
6467
];
6568

6669
yield [
6770
new Dsn('mailpace+api', 'example.com', self::USER, '', 8080),
68-
(new MailPaceApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
71+
(new MailPaceApiTransport(self::USER, new MockHttpClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
6972
];
7073

7174
yield [

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111

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

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillApiTransport;
1517
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillHttpTransport;
1618
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillSmtpTransport;
1719
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
20+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1821
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1922
use Symfony\Component\Mailer\Transport\Dsn;
2023
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -23,7 +26,7 @@ class MandrillTransportFactoryTest extends TransportFactoryTestCase
2326
{
2427
public static function getFactory(): TransportFactoryInterface
2528
{
26-
return new MandrillTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
29+
return new MandrillTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2730
}
2831

2932
public static function supportsProvider(): iterable
@@ -61,9 +64,9 @@ public static function supportsProvider(): iterable
6164

6265
public static function createProvider(): iterable
6366
{
64-
$client = self::getClient();
65-
$dispatcher = self::getDispatcher();
66-
$logger = self::getLogger();
67+
$client = new MockHttpClient();
68+
$dispatcher = new DummyEventDispatcher();
69+
$logger = new NullLogger();
6770

6871
yield [
6972
new Dsn('mandrill+api', 'default', self::USER),

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111

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

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunApiTransport;
1517
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunHttpTransport;
1618
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunSmtpTransport;
1719
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
20+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1821
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1922
use Symfony\Component\Mailer\Transport\Dsn;
2023
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -23,7 +26,7 @@ class MailgunTransportFactoryTest extends TransportFactoryTestCase
2326
{
2427
public static function getFactory(): TransportFactoryInterface
2528
{
26-
return new MailgunTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
29+
return new MailgunTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2730
}
2831

2932
public static function supportsProvider(): iterable
@@ -61,9 +64,9 @@ public static function supportsProvider(): iterable
6164

6265
public static function createProvider(): iterable
6366
{
64-
$client = self::getClient();
65-
$dispatcher = self::getDispatcher();
66-
$logger = self::getLogger();
67+
$client = new MockHttpClient();
68+
$dispatcher = new DummyEventDispatcher();
69+
$logger = new NullLogger();
6770

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

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

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

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

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetApiTransport;
1517
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetSmtpTransport;
1618
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
19+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1720
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1821
use Symfony\Component\Mailer\Transport\Dsn;
1922
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -22,7 +25,7 @@ class MailjetTransportFactoryTest extends TransportFactoryTestCase
2225
{
2326
public static function getFactory(): TransportFactoryInterface
2427
{
25-
return new MailjetTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
28+
return new MailjetTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2629
}
2730

2831
public static function supportsProvider(): iterable
@@ -55,17 +58,17 @@ public static function supportsProvider(): iterable
5558

5659
public static function createProvider(): iterable
5760
{
58-
$dispatcher = self::getDispatcher();
59-
$logger = self::getLogger();
61+
$dispatcher = new DummyEventDispatcher();
62+
$logger = new NullLogger();
6063

6164
yield [
6265
new Dsn('mailjet+api', 'default', self::USER, self::PASSWORD),
63-
new MailjetApiTransport(self::USER, self::PASSWORD, self::getClient(), $dispatcher, $logger),
66+
new MailjetApiTransport(self::USER, self::PASSWORD, new MockHttpClient(), $dispatcher, $logger),
6467
];
6568

6669
yield [
6770
new Dsn('mailjet+api', 'example.com', self::USER, self::PASSWORD),
68-
(new MailjetApiTransport(self::USER, self::PASSWORD, self::getClient(), $dispatcher, $logger))->setHost('example.com'),
71+
(new MailjetApiTransport(self::USER, self::PASSWORD, new MockHttpClient(), $dispatcher, $logger))->setHost('example.com'),
6972
];
7073

7174
yield [

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

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

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

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpApiTransport;
1517
use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpSmtpTransport;
1618
use Symfony\Component\Mailer\Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory;
19+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1720
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1821
use Symfony\Component\Mailer\Transport\Dsn;
1922
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -25,7 +28,7 @@ final class OhMySmtpTransportFactoryTest extends TransportFactoryTestCase
2528
{
2629
public static function getFactory(): TransportFactoryInterface
2730
{
28-
return new OhMySmtpTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
31+
return new OhMySmtpTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2932
}
3033

3134
public static function supportsProvider(): iterable
@@ -58,17 +61,17 @@ public static function supportsProvider(): iterable
5861

5962
public static function createProvider(): iterable
6063
{
61-
$dispatcher = self::getDispatcher();
62-
$logger = self::getLogger();
64+
$dispatcher = new DummyEventDispatcher();
65+
$logger = new NullLogger();
6366

6467
yield [
6568
new Dsn('ohmysmtp+api', 'default', self::USER),
66-
new OhMySmtpApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
69+
new OhMySmtpApiTransport(self::USER, new MockHttpClient(), $dispatcher, $logger),
6770
];
6871

6972
yield [
7073
new Dsn('ohmysmtp+api', 'example.com', self::USER, '', 8080),
71-
(new OhMySmtpApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
74+
(new OhMySmtpApiTransport(self::USER, new MockHttpClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
7275
];
7376

7477
yield [

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

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

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

14+
use Psr\Log\NullLogger;
15+
use Symfony\Component\HttpClient\MockHttpClient;
1416
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkApiTransport;
1517
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkSmtpTransport;
1618
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
19+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1720
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
1821
use Symfony\Component\Mailer\Transport\Dsn;
1922
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -22,7 +25,7 @@ class PostmarkTransportFactoryTest extends TransportFactoryTestCase
2225
{
2326
public static function getFactory(): TransportFactoryInterface
2427
{
25-
return new PostmarkTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
28+
return new PostmarkTransportFactory(new DummyEventDispatcher(), new MockHttpClient(), new NullLogger());
2629
}
2730

2831
public static function supportsProvider(): iterable
@@ -55,22 +58,22 @@ public static function supportsProvider(): iterable
5558

5659
public static function createProvider(): iterable
5760
{
58-
$dispatcher = self::getDispatcher();
59-
$logger = self::getLogger();
61+
$dispatcher = new DummyEventDispatcher();
62+
$logger = new NullLogger();
6063

6164
yield [
6265
new Dsn('postmark+api', 'default', self::USER),
63-
new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger),
66+
new PostmarkApiTransport(self::USER, new MockHttpClient(), $dispatcher, $logger),
6467
];
6568

6669
yield [
6770
new Dsn('postmark+api', 'example.com', self::USER, '', 8080),
68-
(new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
71+
(new PostmarkApiTransport(self::USER, new MockHttpClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080),
6972
];
7073

7174
yield [
7275
new Dsn('postmark+api', 'example.com', self::USER, '', 8080, ['message_stream' => 'broadcasts']),
73-
(new PostmarkApiTransport(self::USER, self::getClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080)->setMessageStream('broadcasts'),
76+
(new PostmarkApiTransport(self::USER, new MockHttpClient(), $dispatcher, $logger))->setHost('example.com')->setPort(8080)->setMessageStream('broadcasts'),
7477
];
7578

7679
yield [

0 commit comments

Comments
 (0)
0