8000 [Translation] Convert `$this` calls to static ones in data providers · symfony/symfony@cdacda5 · GitHub
[go: up one dir, main page]
Skip to content

Commit cdacda5

Browse files
alexandre-dauboisOskarStark
alexandre-daubois
authored and
OskarStark
committed
[Translation] Convert $this calls to static ones in data providers
1 parent a2eaf84 commit cdacda5

File tree

19 files changed

+224
-175
lines changed

19 files changed

+224
-175
lines changed

‎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/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/Test/Fixtures/DummyEventDispatcher.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Mailer\Test\Fixtures;
13+
14+
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
15+
16+
class DummyEventDispatcher implements EventDispatcherInterface
17+
{
18+
public function dispatch(object $event, string $eventName = null): object
19+
{
20+
}
21+
}

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
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;
20+
use Symfony\Component\Mailer\Test\Fixtures\DummyEventDispatcher;
1821
use Symfony\Component\Mailer\Transport\Dsn;
1922
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
2023
use Symfony\Component\Mailer\Transport\TransportInterface;
@@ -31,11 +34,11 @@ abstract class TransportFactoryTestCase extends TestCase
3134
protected const USER = 'u$er';
3235
protected const PASSWORD = 'pa$s';
3336

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

38-
abstract public function getFactory(): TransportFactoryInterface;
41+
abstract public static function getFactory(): TransportFactoryInterface;
3942

4043
abstract public static function supportsProvider(): iterable;
4144

@@ -100,18 +103,18 @@ public function testIncompleteDsnException(Dsn $dsn)
100103
$factory->create($dsn);
101104
}
102105

103-
protected function getDispatcher(): EventDispatcherInterface
106+
protected static function getDispatcher(): EventDispatcherInterface
104107
{
105-
return $this->dispatcher ?? $this->dispatcher = $this->createMock(EventDispatcherInterface::class);
108+
return self::$dispatcher ?? self::$dispatcher = new DummyEventDispatcher();
106109
}
107110

108-
protected function getClient(): HttpClientInterface
111+
protected static function getClient(): HttpClientInterface
109112
{
110-
return $this->client ?? $this->client = $this->createMock(HttpClientInterface::class);
113+
return self::$client ?? self::$client = new MockHttpClient();
111114
}
112115

113-
protected function getLogger(): LoggerInterface
116+
protected static function getLogger(): LoggerInterface
114117
{
115-
return $this->logger ?? $this->logger = $this->createMock(LoggerInterface::class);
118+
return self::$logger ?? self::$logger = new NullLogger();
116119
}
117120
}

‎src/Symfony/Component/Mailer/Tests/Transport/NullTransportFactoryTest.php

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

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

2727
public static function supportsProvider(): iterable
@@ -36,7 +36,7 @@ public static function createProvider(): iterable
3636
{
3737
yield [
3838
new Dsn('null', 'null'),
39-
new NullTransport($this->getDispatcher(), $this->getLogger()),
39+
new NullTransport(self::getDispatcher(), self::getLogger()),
4040
];
4141
}
4242
}

0 commit comments

Comments
 (0)
0