Skip to content

[Mailer] deprecate the TransportFactoryTestCase #58351

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.

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 1 commit into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions UPGRADE-7.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ Ldap

* Add methods for `saslBind()` and `whoami()` to `ConnectionInterface` and `LdapInterface`

Mailer
------

* Deprecate `TransportFactoryTestCase`, extend `AbstractTransportFactoryTestCase` instead

The `testIncompleteDsnException()` test is no longer provided by default. If you make use of it by implementing the `incompleteDsnProvider()` data providers,
you now need to use the `IncompleteDsnTestTrait`.

Messenger
---------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport;
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesSmtpTransport;
use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class SesTransportFactoryTest extends TransportFactoryTestCase
class SesTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new SesTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=8.2",
"async-aws/ses": "^1.3",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\Mailer\Bridge\Azure\Transport\AzureApiTransport;
use Symfony\Component\Mailer\Bridge\Azure\Transport\AzureTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class AzureTransportFactoryTest extends TransportFactoryTestCase
class AzureTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new AzureTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Azure/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.2",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\Brevo\Transport\BrevoApiTransport;
use Symfony\Component\Mailer\Bridge\Brevo\Transport\BrevoSmtpTransport;
use Symfony\Component\Mailer\Bridge\Brevo\Transport\BrevoTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class BrevoTransportFactoryTest extends TransportFactoryTestCase
class BrevoTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new BrevoTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Brevo/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.1",
"symfony/mailer": "^5.4.21|^6.2.7|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.3|^7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\Mailer\Bridge\Google\Transport\GmailSmtpTransport;
use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class GmailTransportFactoryTest extends TransportFactoryTestCase
class GmailTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new GmailTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Google/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.2",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipApiTransport;
use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipSmtpTransport;
use Symfony\Component\Mailer\Bridge\Infobip\Transport\InfobipTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class InfobipApiTransportFactoryTest extends TransportFactoryTestCase
class InfobipApiTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new InfobipTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Infobip/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
],
"require": {
"php": ">=8.2",
"symfony/mailer": "^6.4|^7.0",
"symfony/mailer": "^7.2",
"symfony/mime": "^6.4|^7.0"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceApiTransport;
use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceSmtpTransport;
use Symfony\Component\Mailer\Bridge\MailPace\Transport\MailPaceTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

final class MailPaceTransportFactoryTest extends TransportFactoryTestCase
final class MailPaceTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new MailPaceTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/MailPace/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"require": {
"php": ">=8.2",
"psr/event-dispatcher": "^1",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillHttpTransport;
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillSmtpTransport;
use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class MandrillTransportFactoryTest extends TransportFactoryTestCase
class MandrillTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new MandrillTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.2",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendApiTransport;
use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendSmtpTransport;
use Symfony\Component\Mailer\Bridge\MailerSend\Transport\MailerSendTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class MailerSendTransportFactoryTest extends TransportFactoryTestCase
class MailerSendTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new MailerSendTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
],
"require": {
"php": ">=8.2",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunHttpTransport;
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunSmtpTransport;
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class MailgunTransportFactoryTest extends TransportFactoryTestCase
class MailgunTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new MailgunTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.2",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetApiTransport;
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetSmtpTransport;
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class MailjetTransportFactoryTest extends TransportFactoryTestCase
class MailjetTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new MailjetTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Mailjet/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.2",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\Mailomat\Transport\MailomatApiTransport;
use Symfony\Component\Mailer\Bridge\Mailomat\Transport\MailomatSmtpTransport;
use Symfony\Component\Mailer\Bridge\Mailomat\Transport\MailomatTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class MailomatTransportFactoryTest extends TransportFactoryTestCase
class MailomatTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new MailomatTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\Mailtrap\Transport\MailtrapApiTransport;
use Symfony\Component\Mailer\Bridge\Mailtrap\Transport\MailtrapSmtpTransport;
use Symfony\Component\Mailer\Bridge\Mailtrap\Transport\MailtrapTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class MailtrapTransportFactoryTest extends TransportFactoryTestCase
class MailtrapTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new MailtrapTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\Mailer\Bridge\Postal\Transport\PostalApiTransport;
use Symfony\Component\Mailer\Bridge\Postal\Transport\PostalTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class PostalTransportFactoryTest extends TransportFactoryTestCase
class PostalTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new PostalTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand All @@ -45,12 +48,12 @@ public static function createProvider(): iterable

yield [
new Dsn('postal+api', 'postal.localhost', null, self::PASSWORD),
(new PostalApiTransport(self::PASSWORD, 'postal.localhost', new MockHttpClient(), null, $logger)),
new PostalApiTransport(self::PASSWORD, 'postal.localhost', new MockHttpClient(), null, $logger),
];

yield [
new Dsn('postal', 'postal.localhost', null, self::PASSWORD),
(new PostalApiTransport(self::PASSWORD, 'postal.localhost', new MockHttpClient(), null, $logger)),
new PostalApiTransport(self::PASSWORD, 'postal.localhost', new MockHttpClient(), null, $logger),
];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkApiTransport;
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkSmtpTransport;
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class PostmarkTransportFactoryTest extends TransportFactoryTestCase
class PostmarkTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new PostmarkTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Mailer/Bridge/Postmark/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=8.2",
"psr/event-dispatcher": "^1",
"symfony/mailer": "^6.4|^7.0"
"symfony/mailer": "^7.2"
},
"require-dev": {
"symfony/http-client": "^6.4|^7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
use Symfony\Component\Mailer\Bridge\Resend\Transport\ResendApiTransport;
use Symfony\Component\Mailer\Bridge\Resend\Transport\ResendSmtpTransport;
use Symfony\Component\Mailer\Bridge\Resend\Transport\ResendTransportFactory;
use Symfony\Component\Mailer\Test\TransportFactoryTestCase;
use Symfony\Component\Mailer\Test\AbstractTransportFactoryTestCase;
use Symfony\Component\Mailer\Test\IncompleteDsnTestTrait;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;

class ResendTransportFactoryTest extends TransportFactoryTestCase
class ResendTransportFactoryTest extends AbstractTransportFactoryTestCase
{
use IncompleteDsnTestTrait;

public function getFactory(): TransportFactoryInterface
{
return new ResendTransportFactory(null, new MockHttpClient(), new NullLogger());
Expand Down
Loading
Loading