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

Skip to content

[BC Break] Make data providers for abstract test cases static #49368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 17, 2023
Merged

[BC Break] Make data providers for abstract test cases static #49368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77c8444
[BC Break] Make data providers for abstract test cases static
OskarStark Feb 14, 2023
c444a43
[Translation][Mailer] Convert `$this` calls to static ones in data pr…
alexandre-daubois Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions UPGRADE-5.4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ Lock
* Deprecate usage of `PdoStore` with a `Doctrine\DBAL\Connection` or a DBAL url, use the new `DoctrineDbalStore` instead
* Deprecate usage of `PostgreSqlStore` with a `Doctrine\DBAL\Connection` or a DBAL url, use the new `DoctrineDbalPostgreSqlStore` instead

Mailer
------

* The following data providers for `TransportFactoryTestCase` are now static: `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
* The following data providers for `TransportTestCase` are now static: `toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`

Messenger
---------

Expand All @@ -78,8 +84,8 @@ Monolog
Notifier
--------

* [BC BREAK] The following data providers for `TransportTestCase` are now static: `toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
* [BC BREAK] The `TransportTestCase::createTransport()` method is now static
* The following data providers for `TransportTestCase` are now static: `toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
* The `TransportTestCase::createTransport()` method is now static

SecurityBundle
--------------
Expand Down Expand Up @@ -108,6 +114,7 @@ SecurityBundle
Security
--------

* `AccessDecisionStrategyTestCase::provideStrategyTests()` is now static
* Deprecate `AuthenticationEvents::AUTHENTICATION_FAILURE`, use the `LoginFailureEvent` instead
* Deprecate the `$authenticationEntryPoint` argument of `ChannelListener`, and add `$httpPort` and `$httpsPort` arguments
* Deprecate `RetryAuthenticationEntryPoint`, this code is now inlined in the `ChannelListener`
Expand Down Expand Up @@ -197,3 +204,9 @@ Security
$token = new PreAuthenticatedToken($user, $firewallName, $roles);
$token = new SwitchUserToken($user, $firewallName, $roles, $originalToken);
```

Translation
-----------

* The following data providers for `ProviderFactoryTestCase` are now static: `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
* `ProviderTestCase::toStringProvider()` is now static
18 changes: 9 additions & 9 deletions src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

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

public function supportsProvider(): iterable
public static function supportsProvider(): iterable
{
yield [
new Dsn('ses+api', 'default'),
Expand Down Expand Up @@ -61,11 +61,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('ses+api', 'default', self::USER, self::PASSWORD),
Expand Down Expand Up @@ -158,15 +158,15 @@ public function createProvider(): iterable
];
}

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

public function incompleteDsnProvider(): iterable
public static function incompleteDsnProvider(): iterable
{
yield [new Dsn('ses+smtp', 'default', self::USER)];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"async-aws/ses": "^1.0",
"psr/event-dispatcher": "^1",
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/mailer": "^4.4.21|^5.2.6|^6.0"
"symfony/mailer": "^5.4.21|^6.2.7"
},
"require-dev": {
"symfony/http-client": "^4.4|^5.0|^6.0"
Expand Down
18 changes: 9 additions & 9 deletions src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@

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

public function supportsProvider(): iterable
public static function supportsProvider(): iterable
{
yield [
new Dsn('gmail', 'default'),
Expand All @@ -47,33 +47,33 @@ public function supportsProvider(): iterable
];
}

public function createProvider(): iterable
public static function createProvider(): iterable
{
yield [
new Dsn('gmail', 'default', self::USER, self::PASSWORD),
new GmailSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
new GmailSmtpTransport(self::USER, self::PASSWORD, self::getDispatcher(), self::getLogger()),
];

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

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

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

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

Expand Down
5 changes: 4 additions & 1 deletion src/Symfony/Component/Mailer/Bridge/Google/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
"require": {
"php": ">=7.2.5",
"psr/event-dispatcher": "^1",
"symfony/mailer": "^4.4|^5.0|^6.0"
"symfony/mailer": "^5.4.21|^6.2.7"
},
"require-dev": {
"symfony/http-client": "^4.4|^5.0|^6.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Google\\": "" },
Expand Down
18 changes: 9 additions & 9 deletions ...ymfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

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

public function supportsProvider(): iterable
public static function supportsProvider(): iterable
{
yield [
new Dsn('mandrill', '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('mandrill+api', 'default', self::USER),
Expand Down Expand Up @@ -101,15 +101,15 @@ public function createProvider(): iterable
];
}

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=7.2.5",
"psr/event-dispatcher": "^1",
"symfony/mailer": "^5.1|^6.0"
"symfony/mailer": "^5.4.21|^6.2.7"
},
"require-dev": {
"symfony/http-client": "^4.4|^5.0|^6.0"
Expand Down
18 changes: 9 additions & 9 deletions src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
View file
Open in desktop
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 src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=7.2.5",
"psr/event-dispatcher": "^1",
"symfony/mailer": "^5.2.6|^6.0"
"symfony/mailer": "^5.4.21|^6.2.7"
},
"require-dev": {
"symfony/http-client": "^4.4|^5.0|^6.0"
Expand Down
20 changes: 10 additions & 10 deletions src/Symfony/Component/Mailer/Bridge/Mailjet/Tests/Transport/MailjetTransportFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

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

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

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

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

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

yield [
Expand All @@ -84,15 +84,15 @@ public function createProvider(): iterable
];
}

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

public function incompleteDsnProvider(): iterable
public static function incompleteDsnProvider(): iterable
{
yield [new Dsn('mailjet+smtp', 'default')];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=7.2.5",
"psr/event-dispatcher": "^1",
"symfony/mailer": "^4.4|^5.0|^6.0"
"symfony/mailer": "^5.4.21|^6.2.7"
},
"require-dev": {
"symfony/http-client": "^4.4|^5.0|^6.0"
Expand Down
Loading