diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 628d29939a696..1f454a0759c36 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -77,12 +77,12 @@
use Symfony\Component\Lock\Store\FlockStore;
use Symfony\Component\Lock\Store\StoreFactory;
use Symfony\Component\Lock\StoreInterface;
-use Symfony\Component\Mailer\Bridge\Amazon\Factory\SesTransportFactory;
-use Symfony\Component\Mailer\Bridge\Google\Factory\GmailTransportFactory;
-use Symfony\Component\Mailer\Bridge\Mailchimp\Factory\MandrillTransportFactory;
-use Symfony\Component\Mailer\Bridge\Mailgun\Factory\MailgunTransportFactory;
-use Symfony\Component\Mailer\Bridge\Postmark\Factory\PostmarkTransportFactory;
-use Symfony\Component\Mailer\Bridge\Sendgrid\Factory\SendgridTransportFactory;
+use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
+use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
+use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
+use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
use Symfony\Component\Mailer\Mailer;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBus;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml
index bddcc67f01074..d478942a0c3f0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml
@@ -11,27 +11,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md
index 453e0d98fa8a5..9830cadaa10c8 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md
@@ -1,7 +1,15 @@
CHANGELOG
=========
+4.4.0
+-----
+
+ * [BC BREAK] Renamed and moved `Symfony\Component\Mailer\Bridge\Amazon\Http\Api\SesTransport`
+ to `Symfony\Component\Mailer\Bridge\Amazon\Transpor\SesApiTransport`, `Symfony\Component\Mailer\Bridge\Amazon\Http\SesTransport`
+ to `Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpTransport`, `Symfony\Component\Mailer\Bridge\Amazon\Smtp\SesTransport`
+ to `Symfony\Component\Mailer\Bridge\Amazon\Transport\SesSmtpTransport`.
+
4.3.0
-----
- * added the bridge
+ * Added the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Factory/SesTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
similarity index 71%
rename from src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Factory/SesTransportFactoryTest.php
rename to src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
index 8b5a6c8d935f2..dd3ee43fad6d7 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Factory/SesTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
@@ -9,10 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Amazon\Tests\Factory;
+namespace Symfony\Component\Mailer\Bridge\Amazon\Tests\Transport;
-use Symfony\Component\Mailer\Bridge\Amazon;
-use Symfony\Component\Mailer\Bridge\Amazon\Factory\SesTransportFactory;
+use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiTransport;
+use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpTransport;
+use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesSmtpTransport;
+use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -55,32 +57,32 @@ public function createProvider(): iterable
yield [
new Dsn('api', 'ses', self::USER, self::PASSWORD),
- new Amazon\Http\Api\SesTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
+ new SesApiTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
];
yield [
new Dsn('api', 'ses', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
- new Amazon\Http\Api\SesTransport(self::USER, self::PASSWORD, 'eu-west-1', $client, $dispatcher, $logger),
+ new SesApiTransport(self::USER, self::PASSWORD, 'eu-west-1', $client, $dispatcher, $logger),
];
yield [
new Dsn('http', 'ses', self::USER, self::PASSWORD),
- new Amazon\Http\SesTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
+ new SesHttpTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
];
yield [
new Dsn('http', 'ses', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
- new Amazon\Http\SesTransport(self::USER, self::PASSWORD, 'eu-west-1', $client, $dispatcher, $logger),
+ new SesHttpTransport(self::USER, self::PASSWORD, 'eu-west-1', $client, $dispatcher, $logger),
];
yield [
new Dsn('smtp', 'ses', self::USER, self::PASSWORD),
- new Amazon\Smtp\SesTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
+ new SesSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
];
yield [
new Dsn('smtp', 'ses', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
- new Amazon\Smtp\SesTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
+ new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
];
}
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Http/Api/SesTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
similarity index 95%
rename from src/Symfony/Component/Mailer/Bridge/Amazon/Http/Api/SesTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
index 9bc32aff6f2f4..e3710f0632cb3 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Http/Api/SesTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Amazon\Http\Api;
+namespace Symfony\Component\Mailer\Bridge\Amazon\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SmtpEnvelope;
-use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
+use Symfony\Component\Mailer\Transport\AbstractApiTransport;
use Symfony\Component\Mime\Email;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -23,7 +23,7 @@
/**
* @author Kevin Verschaeve
*/
-class SesTransport extends AbstractApiTransport
+class SesApiTransport extends AbstractApiTransport
{
private const ENDPOINT = 'https://email.%region%.amazonaws.com';
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Http/SesTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php
similarity index 93%
rename from src/Symfony/Component/Mailer/Bridge/Amazon/Http/SesTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php
index 936781a7ccb5c..43482567ca8e8 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Http/SesTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Amazon\Http;
+namespace Symfony\Component\Mailer\Bridge\Amazon\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
+use Symfony\Component\Mailer\Transport\AbstractHttpTransport;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -22,7 +22,7 @@
/**
* @author Kevin Verschaeve
*/
-class SesTransport extends AbstractHttpTransport
+class SesHttpTransport extends AbstractHttpTransport
{
private const ENDPOINT = 'https://email.%region%.amazonaws.com';
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Smtp/SesTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php
similarity index 89%
rename from src/Symfony/Component/Mailer/Bridge/Amazon/Smtp/SesTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php
index 918028456852e..c1eb245212c76 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Smtp/SesTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Amazon\Smtp;
+namespace Symfony\Component\Mailer\Bridge\Amazon\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -18,7 +18,7 @@
/**
* @author Kevin Verschaeve
*/
-class SesTransport extends EsmtpTransport
+class SesSmtpTransport extends EsmtpTransport
{
/**
* @param string $region Amazon SES region (currently one of us-east-1, us-west-2, or eu-west-1)
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Factory/SesTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php
similarity index 71%
rename from src/Symfony/Component/Mailer/Bridge/Amazon/Factory/SesTransportFactory.php
rename to src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php
index 5e1b3d473d745..80f6326a69e89 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/Factory/SesTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php
@@ -9,9 +9,8 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Amazon\Factory;
+namespace Symfony\Component\Mailer\Bridge\Amazon\Transport;
-use Symfony\Component\Mailer\Bridge\Amazon;
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
use Symfony\Component\Mailer\Transport\Dsn;
@@ -30,15 +29,15 @@ public function create(Dsn $dsn): TransportInterface
$region = $dsn->getOption('region');
if ('api' === $scheme) {
- return new Amazon\Http\Api\SesTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
+ return new SesApiTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
}
if ('http' === $scheme) {
- return new Amazon\Http\SesTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
+ return new SesHttpTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
}
if ('smtp' === $scheme) {
- return new Amazon\Smtp\SesTransport($user, $password, $region, $this->dispatcher, $this->logger);
+ return new SesSmtpTransport($user, $password, $region, $this->dispatcher, $this->logger);
}
throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Google/CHANGELOG.md
index 453e0d98fa8a5..57b451a946543 100644
--- a/src/Symfony/Component/Mailer/Bridge/Google/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Google/CHANGELOG.md
@@ -1,7 +1,13 @@
CHANGELOG
=========
+4.4.0
+-----
+
+ * [BC BREAK] Renamed and moved `Symfony\Component\Mailer\Bridge\Google\Smtp\GmailTransport`
+ to `Symfony\Component\Mailer\Bridge\Google\Transport\GmailSmtpTransport`.
+
4.3.0
-----
- * added the bridge
+ * Added the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Tests/Factory/GmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
similarity index 79%
rename from src/Symfony/Component/Mailer/Bridge/Google/Tests/Factory/GmailTransportFactoryTest.php
rename to src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
index 27e44d9172258..98de0b30b8ec5 100644
--- a/src/Symfony/Component/Mailer/Bridge/Google/Tests/Factory/GmailTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Google/Tests/Transport/GmailTransportFactoryTest.php
@@ -1,9 +1,9 @@
getDispatcher(), $this->getLogger()),
+ new GmailSmtpTransport(self::USER, self::PASSWORD, $this->getDispatcher(), $this->getLogger()),
];
}
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Smtp/GmailTransport.php b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php
similarity index 87%
rename from src/Symfony/Component/Mailer/Bridge/Google/Smtp/GmailTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php
index 145deeee53875..4f51b4ff60bdb 100644
--- a/src/Symfony/Component/Mailer/Bridge/Google/Smtp/GmailTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailSmtpTransport.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Google\Smtp;
+namespace Symfony\Component\Mailer\Bridge\Google\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -18,7 +18,7 @@
/**
* @author Kevin Verschaeve
*/
-class GmailTransport extends EsmtpTransport
+class GmailSmtpTransport extends EsmtpTransport
{
public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
{
diff --git a/src/Symfony/Component/Mailer/Bridge/Google/Factory/GmailTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailTransportFactory.php
similarity index 78%
rename from src/Symfony/Component/Mailer/Bridge/Google/Factory/GmailTransportFactory.php
rename to src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailTransportFactory.php
index 76f9fadfd2e3b..ad32e18843725 100644
--- a/src/Symfony/Component/Mailer/Bridge/Google/Factory/GmailTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Bridge/Google/Transport/GmailTransportFactory.php
@@ -9,9 +9,8 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Google\Factory;
+namespace Symfony\Component\Mailer\Bridge\Google\Transport;
-use Symfony\Component\Mailer\Bridge\Google\Smtp\GmailTransport;
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
use Symfony\Component\Mailer\Transport\Dsn;
@@ -25,7 +24,7 @@ final class GmailTransportFactory extends AbstractTransportFactory
public function create(Dsn $dsn): TransportInterface
{
if ('smtp' === $dsn->getScheme()) {
- return new GmailTransport($this->getUser($dsn), $this->getPassword($dsn), $this->dispatcher, $this->logger);
+ return new GmailSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $this->dispatcher, $this->logger);
}
throw new UnsupportedSchemeException($dsn, ['smtp']);
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Mailchimp/CHANGELOG.md
index 453e0d98fa8a5..332571da66647 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/CHANGELOG.md
@@ -1,7 +1,15 @@
CHANGELOG
=========
+4.4.0
+-----
+
+ * [BC BREAK] Renamed and moved `Symfony\Component\Mailer\Bridge\Mailchimp\Http\Api\MandrillTransport`
+ to `Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillApiTransport`, `Symfony\Component\Mailer\Bridge\Mailchimp\Http\MandrillTransport`
+ to `Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillHttpTransport`, `Symfony\Component\Mailer\Bridge\Mailchimp\Smtp\MandrillTransport`
+ to `Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillSmtpTransport`.
+
4.3.0
-----
- * added the bridge
+ * Added the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Factory/MandrillTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
similarity index 75%
rename from src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Factory/MandrillTransportFactoryTest.php
rename to src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
index 17e6d2d8dd18a..cdb130a32b017 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Factory/MandrillTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillTransportFactoryTest.php
@@ -9,10 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailchimp\Tests\Factory;
+namespace Symfony\Component\Mailer\Bridge\Mailchimp\Tests\Transport;
-use Symfony\Component\Mailer\Bridge\Mailchimp;
-use Symfony\Component\Mailer\Bridge\Mailchimp\Factory\MandrillTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillApiTransport;
+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\Tests\TransportFactoryTestCase;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -55,17 +57,17 @@ public function createProvider(): iterable
yield [
new Dsn('api', 'mandrill', self::USER),
- new Mailchimp\Http\Api\MandrillTransport(self::USER, $client, $dispatcher, $logger),
+ new MandrillApiTransport(self::USER, $client, $dispatcher, $logger),
];
yield [
new Dsn('http', 'mandrill', self::USER),
- new Mailchimp\Http\MandrillTransport(self::USER, $client, $dispatcher, $logger),
+ new MandrillHttpTransport(self::USER, $client, $dispatcher, $logger),
];
yield [
new Dsn('smtp', 'mandrill', self::USER, self::PASSWORD),
- new Mailchimp\Smtp\MandrillTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
+ new MandrillSmtpTransport(self::USER, self::PASSWORD, $dispatcher, $logger),
];
}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php
similarity index 95%
rename from src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php
index 67600d42d2326..d4be46d5ab8bf 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailchimp\Http\Api;
+namespace Symfony\Component\Mailer\Bridge\Mailchimp\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SmtpEnvelope;
-use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
+use Symfony\Component\Mailer\Transport\AbstractApiTransport;
use Symfony\Component\Mime\Email;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -23,7 +23,7 @@
/**
* @author Kevin Verschaeve
*/
-class MandrillTransport extends AbstractApiTransport
+class MandrillApiTransport extends AbstractApiTransport
{
private const ENDPOINT = 'https://mandrillapp.com/api/1.0/messages/send.json';
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/MandrillTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
similarity index 91%
rename from src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/MandrillTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
index c6e06b496ca6a..10ef9046e6a74 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/MandrillTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailchimp\Http;
+namespace Symfony\Component\Mailer\Bridge\Mailchimp\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
+use Symfony\Component\Mailer\Transport\AbstractHttpTransport;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -22,7 +22,7 @@
/**
* @author Kevin Verschaeve
*/
-class MandrillTransport extends AbstractHttpTransport
+class MandrillHttpTransport extends AbstractHttpTransport
{
private const ENDPOINT = 'https://mandrillapp.com/api/1.0/messages/send-raw.json';
private $key;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Smtp/MandrillTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php
similarity index 86%
rename from src/Symfony/Component/Mailer/Bridge/Mailchimp/Smtp/MandrillTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php
index aad3fb095ade1..13be53717b043 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Smtp/MandrillTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillSmtpTransport.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailchimp\Smtp;
+namespace Symfony\Component\Mailer\Bridge\Mailchimp\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -18,7 +18,7 @@
/**
* @author Kevin Verschaeve
*/
-class MandrillTransport extends EsmtpTransport
+class MandrillSmtpTransport extends EsmtpTransport
{
public function __construct(string $username, string $password, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
{
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Factory/MandrillTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillTransportFactory.php
similarity index 71%
rename from src/Symfony/Component/Mailer/Bridge/Mailchimp/Factory/MandrillTransportFactory.php
rename to src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillTransportFactory.php
index f0ca3349e40b9..0b42bae1dcad8 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Factory/MandrillTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillTransportFactory.php
@@ -9,9 +9,8 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailchimp\Factory;
+namespace Symfony\Component\Mailer\Bridge\Mailchimp\Transport;
-use Symfony\Component\Mailer\Bridge\Mailchimp;
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
use Symfony\Component\Mailer\Transport\Dsn;
@@ -28,17 +27,17 @@ public function create(Dsn $dsn): TransportInterface
$user = $this->getUser($dsn);
if ('api' === $scheme) {
- return new Mailchimp\Http\Api\MandrillTransport($user, $this->client, $this->dispatcher, $this->logger);
+ return new MandrillApiTransport($user, $this->client, $this->dispatcher, $this->logger);
}
if ('http' === $scheme) {
- return new Mailchimp\Http\MandrillTransport($user, $this->client, $this->dispatcher, $this->logger);
+ return new MandrillHttpTransport($user, $this->client, $this->dispatcher, $this->logger);
}
if ('smtp' === $scheme) {
$password = $this->getPassword($dsn);
- return new Mailchimp\Smtp\MandrillTransport($user, $password, $this->dispatcher, $this->logger);
+ return new MandrillSmtpTransport($user, $password, $this->dispatcher, $this->logger);
}
throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Mailgun/CHANGELOG.md
index 453e0d98fa8a5..f02e03f75dea6 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/CHANGELOG.md
@@ -1,7 +1,15 @@
CHANGELOG
=========
+4.4.0
+-----
+
+ * [BC BREAK] Renamed and moved `Symfony\Component\Mailer\Bridge\Mailgun\Http\Api\MailgunTransport`
+ to `Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunApiTransport`, `Symfony\Component\Mailer\Bridge\Mailgun\Http\MailgunTransport`
+ to `Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunHttpTransport`, `Symfony\Component\Mailer\Bridge\Mailgun\Smtp\MailgunTransport`
+ to `Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunSmtpTransport`.
+
4.3.0
-----
- * added the bridge
+ * Added the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Factory/MailgunTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
similarity index 73%
rename from src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Factory/MailgunTransportFactoryTest.php
rename to src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
index 535042bf349ce..43d324d9efc95 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Factory/MailgunTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunTransportFactoryTest.php
@@ -9,10 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailgun\Tests\Factory;
+namespace Symfony\Component\Mailer\Bridge\Mailgun\Tests\Transport;
-use Symfony\Component\Mailer\Bridge\Mailgun;
-use Symfony\Component\Mailer\Bridge\Mailgun\Factory\MailgunTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunApiTransport;
+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\Tests\TransportFactoryTestCase;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -55,22 +57,22 @@ public function createProvider(): iterable
yield [
new Dsn('api', 'mailgun', self::USER, self::PASSWORD),
- new Mailgun\Http\Api\MailgunTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
+ new MailgunApiTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
];
yield [
new Dsn('api', 'mailgun', self::USER, self::PASSWORD, null, ['region' => 'eu']),
- new Mailgun\Http\Api\MailgunTransport(self::USER, self::PASSWORD, 'eu', $client, $dispatcher, $logger),
+ new MailgunApiTransport(self::USER, self::PASSWORD, 'eu', $client, $dispatcher, $logger),
];
yield [
new Dsn('http', 'mailgun', self::USER, self::PASSWORD),
- new Mailgun\Http\MailgunTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
+ new MailgunHttpTransport(self::USER, self::PASSWORD, null, $client, $dispatcher, $logger),
];
yield [
new Dsn('smtp', 'mailgun', self::USER, self::PASSWORD),
- new Mailgun\Smtp\MailgunTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
+ new MailgunSmtpTransport(self::USER, self::PASSWORD, null, $dispatcher, $logger),
];
}
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Http/Api/MailgunTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php
similarity index 96%
rename from src/Symfony/Component/Mailer/Bridge/Mailgun/Http/Api/MailgunTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php
index 74a3ab20868dc..0a1872146bf64 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Http/Api/MailgunTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailgun\Http\Api;
+namespace Symfony\Component\Mailer\Bridge\Mailgun\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SmtpEnvelope;
-use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
+use Symfony\Component\Mailer\Transport\AbstractApiTransport;
use Symfony\Component\Mime\Email;
use Symfony\Component\Mime\Part\Multipart\FormDataPart;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -24,7 +24,7 @@
/**
* @author Kevin Verschaeve
*/
-class MailgunTransport extends AbstractApiTransport
+class MailgunApiTransport extends AbstractApiTransport
{
private const ENDPOINT = 'https://api.%region_dot%mailgun.net/v3/%domain%/messages';
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Http/MailgunTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php
similarity index 92%
rename from src/Symfony/Component/Mailer/Bridge/Mailgun/Http/MailgunTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php
index 1ba6df4745772..df98218407ed9 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Http/MailgunTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailgun\Http;
+namespace Symfony\Component\Mailer\Bridge\Mailgun\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
+use Symfony\Component\Mailer\Transport\AbstractHttpTransport;
use Symfony\Component\Mime\Part\DataPart;
use Symfony\Component\Mime\Part\Multipart\FormDataPart;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -24,7 +24,7 @@
/**
* @author Kevin Verschaeve
*/
-class MailgunTransport extends AbstractHttpTransport
+class MailgunHttpTransport extends AbstractHttpTransport
{
private const ENDPOINT = 'https://api.%region_dot%mailgun.net/v3/%domain%/messages.mime';
private $key;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Smtp/MailgunTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php
similarity index 88%
rename from src/Symfony/Component/Mailer/Bridge/Mailgun/Smtp/MailgunTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php
index b38bfd3c2970a..cd4530c120924 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Smtp/MailgunTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunSmtpTransport.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailgun\Smtp;
+namespace Symfony\Component\Mailer\Bridge\Mailgun\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -18,7 +18,7 @@
/**
* @author Kevin Verschaeve
*/
-class MailgunTransport extends EsmtpTransport
+class MailgunSmtpTransport extends EsmtpTransport
{
public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
{
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Factory/MailgunTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunTransportFactory.php
similarity index 70%
rename from src/Symfony/Component/Mailer/Bridge/Mailgun/Factory/MailgunTransportFactory.php
rename to src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunTransportFactory.php
index 2f0c369c8568a..33ecf88fc628e 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Factory/MailgunTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunTransportFactory.php
@@ -9,9 +9,8 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Mailgun\Factory;
+namespace Symfony\Component\Mailer\Bridge\Mailgun\Transport;
-use Symfony\Component\Mailer\Bridge\Mailgun;
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
use Symfony\Component\Mailer\Transport\Dsn;
@@ -30,15 +29,15 @@ public function create(Dsn $dsn): TransportInterface
$region = $dsn->getOption('region');
if ('api' === $scheme) {
- return new Mailgun\Http\Api\MailgunTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
+ return new MailgunApiTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
}
if ('http' === $scheme) {
- return new Mailgun\Http\MailgunTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
+ return new MailgunHttpTransport($user, $password, $region, $this->client, $this->dispatcher, $this->logger);
}
if ('smtp' === $scheme) {
- return new Mailgun\Smtp\MailgunTransport($user, $password, $region, $this->dispatcher, $this->logger);
+ return new MailgunSmtpTransport($user, $password, $region, $this->dispatcher, $this->logger);
}
throw new UnsupportedSchemeException($dsn, ['api', 'http', 'smtp']);
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Postmark/CHANGELOG.md
index 453e0d98fa8a5..ebfda7b7fe055 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/CHANGELOG.md
@@ -1,7 +1,14 @@
CHANGELOG
=========
+4.4.0
+-----
+
+ * [BC BREAK] Renamed and moved `Symfony\Component\Mailer\Bridge\Postmark\Http\Api\PostmarkTransport`
+ to `Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkApiTransport`, `Symfony\Component\Mailer\Bridge\Postmark\Smtp\PostmarkTransport`
+ to `Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkSmtpTransport`.
+
4.3.0
-----
- * added the bridge
+ * Added the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Factory/PostmarkTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php
similarity index 78%
rename from src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Factory/PostmarkTransportFactoryTest.php
rename to src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php
index 0a7175cbaf311..499af5aed827e 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Factory/PostmarkTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkTransportFactoryTest.php
@@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Postmark\Tests\Factory;
+namespace Symfony\Component\Mailer\Bridge\Postmark\Tests\Transport;
-use Symfony\Component\Mailer\Bridge\Postmark;
-use Symfony\Component\Mailer\Bridge\Postmark\Factory\PostmarkTransportFactory;
+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\Tests\TransportFactoryTestCase;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -49,12 +50,12 @@ public function createProvider(): iterable
yield [
new Dsn('api', 'postmark', self::USER),
- new Postmark\Http\Api\PostmarkTransport(self::USER, $this->getClient(), $dispatcher, $logger),
+ new PostmarkApiTransport(self::USER, $this->getClient(), $dispatcher, $logger),
];
yield [
new Dsn('smtp', 'postmark', self::USER),
- new Postmark\Smtp\PostmarkTransport(self::USER, $dispatcher, $logger),
+ new PostmarkSmtpTransport(self::USER, $dispatcher, $logger),
];
}
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Http/Api/PostmarkTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php
similarity index 94%
rename from src/Symfony/Component/Mailer/Bridge/Postmark/Http/Api/PostmarkTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php
index 5d327182b5fb2..07a45fb0ccbc8 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/Http/Api/PostmarkTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Postmark\Http\Api;
+namespace Symfony\Component\Mailer\Bridge\Postmark\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SmtpEnvelope;
-use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
+use Symfony\Component\Mailer\Transport\AbstractApiTransport;
use Symfony\Component\Mime\Email;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -23,7 +23,7 @@
/**
* @author Kevin Verschaeve
*/
-class PostmarkTransport extends AbstractApiTransport
+class PostmarkApiTransport extends AbstractApiTransport
{
private const ENDPOINT = 'http://api.postmarkapp.com/email';
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Smtp/PostmarkTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php
similarity index 86%
rename from src/Symfony/Component/Mailer/Bridge/Postmark/Smtp/PostmarkTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php
index 67496cea3fc8e..29b5bd53ac41b 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/Smtp/PostmarkTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkSmtpTransport.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Postmark\Smtp;
+namespace Symfony\Component\Mailer\Bridge\Postmark\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -18,7 +18,7 @@
/**
* @author Kevin Verschaeve
*/
-class PostmarkTransport extends EsmtpTransport
+class PostmarkSmtpTransport extends EsmtpTransport
{
public function __construct(string $id, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
{
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Factory/PostmarkTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkTransportFactory.php
similarity index 76%
rename from src/Symfony/Component/Mailer/Bridge/Postmark/Factory/PostmarkTransportFactory.php
rename to src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkTransportFactory.php
index cefcd3cd304b5..16d491091a1fe 100644
--- a/src/Symfony/Component/Mailer/Bridge/Postmark/Factory/PostmarkTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkTransportFactory.php
@@ -9,9 +9,8 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Postmark\Factory;
+namespace Symfony\Component\Mailer\Bridge\Postmark\Transport;
-use Symfony\Component\Mailer\Bridge\Postmark;
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
use Symfony\Component\Mailer\Transport\Dsn;
@@ -28,11 +27,11 @@ public function create(Dsn $dsn): TransportInterface
$user = $this->getUser($dsn);
if ('api' === $scheme) {
- return new Postmark\Http\Api\PostmarkTransport($user, $this->client, $this->dispatcher, $this->logger);
+ return new PostmarkApiTransport($user, $this->client, $this->dispatcher, $this->logger);
}
if ('smtp' === $scheme) {
- return new Postmark\Smtp\PostmarkTransport($user, $this->dispatcher, $this->logger);
+ return new PostmarkSmtpTransport($user, $this->dispatcher, $this->logger);
}
throw new UnsupportedSchemeException($dsn, ['api', 'smtp']);
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Sendgrid/CHANGELOG.md
index 453e0d98fa8a5..d6b7062cf3f8c 100644
--- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/CHANGELOG.md
@@ -1,7 +1,14 @@
CHANGELOG
=========
+4.4.0
+-----
+
+ * [BC BREAK] Renamed and moved `Symfony\Component\Mailer\Bridge\Sendgrid\Http\Api\SendgridTransport`
+ to `Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridApiTransport`, `Symfony\Component\Mailer\Bridge\Sendgrid\Smtp\SendgridTransport`
+ to `Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridSmtpTransport`.
+
4.3.0
-----
- * added the bridge
+ * Added the bridge
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Factory/SendgridTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php
similarity index 76%
rename from src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Factory/SendgridTransportFactoryTest.php
rename to src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php
index 2f287c8469fe5..24301d89d05d8 100644
--- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Factory/SendgridTransportFactoryTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridTransportFactoryTest.php
@@ -9,10 +9,11 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Sendgrid\Tests\Factory;
+namespace Symfony\Component\Mailer\Bridge\Sendgrid\Tests\Transport;
-use Symfony\Component\Mailer\Bridge\Sendgrid;
-use Symfony\Component\Mailer\Bridge\Sendgrid\Factory\SendgridTransportFactory;
+use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridApiTransport;
+use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridSmtpTransport;
+use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;
use Symfony\Component\Mailer\Transport\Dsn;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -49,12 +50,12 @@ public function createProvider(): iterable
yield [
new Dsn('api', 'sendgrid', self::USER),
- new Sendgrid\Http\Api\SendgridTransport(self::USER, $this->getClient(), $dispatcher, $logger),
+ new SendgridApiTransport(self::USER, $this->getClient(), $dispatcher, $logger),
];
yield [
new Dsn('smtp', 'sendgrid', self::USER),
- new Sendgrid\Smtp\SendgridTransport(self::USER, $dispatcher, $logger),
+ new SendgridSmtpTransport(self::USER, $dispatcher, $logger),
];
}
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Http/Api/SendgridTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php
similarity index 96%
rename from src/Symfony/Component/Mailer/Bridge/Sendgrid/Http/Api/SendgridTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php
index 628951aaf9f2c..94b657e398ded 100644
--- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Http/Api/SendgridTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php
@@ -9,12 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Sendgrid\Http\Api;
+namespace Symfony\Component\Mailer\Bridge\Sendgrid\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SmtpEnvelope;
-use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
+use Symfony\Component\Mailer\Transport\AbstractApiTransport;
use Symfony\Component\Mime\Address;
use Symfony\Component\Mime\Email;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -24,7 +24,7 @@
/**
* @author Kevin Verschaeve
*/
-class SendgridTransport extends AbstractApiTransport
+class SendgridApiTransport extends AbstractApiTransport
{
private const ENDPOINT = 'https://api.sendgrid.com/v3/mail/send';
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Smtp/SendgridTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php
similarity index 86%
rename from src/Symfony/Component/Mailer/Bridge/Sendgrid/Smtp/SendgridTransport.php
rename to src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php
index f682fab16426d..ff448c591a7b7 100644
--- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Smtp/SendgridTransport.php
+++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridSmtpTransport.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Sendgrid\Smtp;
+namespace Symfony\Component\Mailer\Bridge\Sendgrid\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
@@ -18,7 +18,7 @@
/**
* @author Kevin Verschaeve
*/
-class SendgridTransport extends EsmtpTransport
+class SendgridSmtpTransport extends EsmtpTransport
{
public function __construct(string $key, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
{
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Factory/SendgridTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridTransportFactory.php
similarity index 75%
rename from src/Symfony/Component/Mailer/Bridge/Sendgrid/Factory/SendgridTransportFactory.php
rename to src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridTransportFactory.php
index a2d1bfdae6667..dbd2b5ae9c123 100644
--- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Factory/SendgridTransportFactory.php
+++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridTransportFactory.php
@@ -9,9 +9,8 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Bridge\Sendgrid\Factory;
+namespace Symfony\Component\Mailer\Bridge\Sendgrid\Transport;
-use Symfony\Component\Mailer\Bridge\Sendgrid;
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
use Symfony\Component\Mailer\Transport\Dsn;
@@ -27,11 +26,11 @@ public function create(Dsn $dsn): TransportInterface
$key = $this->getUser($dsn);
if ('api' === $dsn->getScheme()) {
- return new Sendgrid\Http\Api\SendgridTransport($key, $this->client, $this->dispatcher, $this->logger);
+ return new SendgridApiTransport($key, $this->client, $this->dispatcher, $this->logger);
}
if ('smtp' === $dsn->getScheme()) {
- return new Sendgrid\Smtp\SendgridTransport($key, $this->dispatcher, $this->logger);
+ return new SendgridSmtpTransport($key, $this->dispatcher, $this->logger);
}
throw new UnsupportedSchemeException($dsn, ['api', 'smtp']);
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
index 7e2c53504b198..b1cf5060ed892 100644
--- a/src/Symfony/Component/Mailer/CHANGELOG.md
+++ b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
4.4.0
-----
+ * [BC BREAK] Classes `AbstractApiTransport` and `AbstractHttpTransport` moved under `Transport` sub-namespace.
* [BC BREAK] Transports depend on `Symfony\Contracts\EventDispatcher\EventDispatcherInterface`
instead of `Symfony\Component\EventDispatcher\EventDispatcherInterface`.
* Added possibility to register custom transport for dsn by implementing
diff --git a/src/Symfony/Component/Mailer/Exception/UnsupportedHostException.php b/src/Symfony/Component/Mailer/Exception/UnsupportedHostException.php
index 92af7b25671d8..67a6ef12aaa91 100644
--- a/src/Symfony/Component/Mailer/Exception/UnsupportedHostException.php
+++ b/src/Symfony/Component/Mailer/Exception/UnsupportedHostException.php
@@ -21,27 +21,27 @@ class UnsupportedHostException extends LogicException
{
private const HOST_TO_PACKAGE_MAP = [
'gmail' => [
- 'class' => Bridge\Google\Factory\GmailTransportFactory::class,
+ 'class' => Bridge\Google\Transport\GmailTransportFactory::class,
'package' => 'symfony/google-mailer',
],
'mailgun' => [
- 'class' => Bridge\Mailgun\Factory\MailgunTransportFactory::class,
+ 'class' => Bridge\Mailgun\Transport\MailgunTransportFactory::class,
'package' => 'symfony/mailgun-mailer',
],
'postmark' => [
- 'class' => Bridge\Postmark\Factory\PostmarkTransportFactory::class,
+ 'class' => Bridge\Postmark\Transport\PostmarkTransportFactory::class,
'package' => 'symfony/postmark-mailer',
],
'sendgrid' => [
- 'class' => Bridge\Sendgrid\Factory\SendgridTransportFactory::class,
+ 'class' => Bridge\Sendgrid\Transport\SendgridTransportFactory::class,
'package' => 'symfony/sendgrid-mailer',
],
'ses' => [
- 'class' => Bridge\Amazon\Factory\SesTransportFactory::class,
+ 'class' => Bridge\Amazon\Transport\SesTransportFactory::class,
'package' => 'symfony/amazon-mailer',
],
'mandrill' => [
- 'class' => Bridge\Mailchimp\Factory\MandrillTransportFactory::class,
+ 'class' => Bridge\Mailchimp\Transport\MandrillTransportFactory::class,
'package' => 'symfony/mailchimp-mailer',
],
];
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
index 6fb3a1a08d358..d5a053ed27823 100644
--- a/src/Symfony/Component/Mailer/Tests/TransportTest.php
+++ b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -16,6 +16,8 @@
use Symfony\Component\Mailer\SmtpEnvelope;
use Symfony\Component\Mailer\Transport;
use Symfony\Component\Mailer\Transport\Dsn;
+use Symfony\Component\Mailer\Transport\FailoverTransport;
+use Symfony\Component\Mailer\Transport\RoundRobinTransport;
use Symfony\Component\Mailer\Transport\TransportInterface;
use Symfony\Component\Mime\RawMessage;
@@ -43,12 +45,12 @@ public function fromStringProvider(): iterable
yield 'failover transport' => [
'dummy://a || dummy://b',
- new Transport\FailoverTransport([$transportA, $transportB]),
+ new FailoverTransport([$transportA, $transportB]),
];
yield 'round robin transport' => [
'dummy://a && dummy://b',
- new Transport\RoundRobinTransport([$transportA, $transportB]),
+ new RoundRobinTransport([$transportA, $transportB]),
];
}
}
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
index b167b17d8c45c..6617f241209db 100644
--- a/src/Symfony/Component/Mailer/Transport.php
+++ b/src/Symfony/Component/Mailer/Transport.php
@@ -12,15 +12,17 @@
namespace Symfony\Component\Mailer;
use Psr\Log\LoggerInterface;
-use Symfony\Component\Mailer\Bridge\Amazon\Factory\SesTransportFactory;
-use Symfony\Component\Mailer\Bridge\Google\Factory\GmailTransportFactory;
-use Symfony\Component\Mailer\Bridge\Mailchimp\Factory\MandrillTransportFactory;
-use Symfony\Component\Mailer\Bridge\Mailgun\Factory\MailgunTransportFactory;
-use Symfony\Component\Mailer\Bridge\Postmark\Factory\PostmarkTransportFactory;
-use Symfony\Component\Mailer\Bridge\Sendgrid\Factory\SendgridTransportFactory;
+use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory;
+use Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
+use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
+use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
+use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
use Symfony\Component\Mailer\Exception\UnsupportedHostException;
use Symfony\Component\Mailer\Transport\Dsn;
+use Symfony\Component\Mailer\Transport\FailoverTransport;
use Symfony\Component\Mailer\Transport\NullTransportFactory;
+use Symfony\Component\Mailer\Transport\RoundRobinTransport;
use Symfony\Component\Mailer\Transport\SendmailTransportFactory;
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransportFactory;
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
@@ -64,12 +66,12 @@ public function fromString(string $dsn): TransportInterface
{
$dsns = preg_split('/\s++\|\|\s++/', $dsn);
if (\count($dsns) > 1) {
- return new Transport\FailoverTransport($this->createFromDsns($dsns));
+ return new FailoverTransport($this->createFromDsns($dsns));
}
$dsns = preg_split('/\s++&&\s++/', $dsn);
if (\count($dsns) > 1) {
- return new Transport\RoundRobinTransport($this->createFromDsns($dsns));
+ return new RoundRobinTransport($this->createFromDsns($dsns));
}
return $this->fromDsnObject(Dsn::fromString($dsn));
diff --git a/src/Symfony/Component/Mailer/Transport/Http/Api/AbstractApiTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php
similarity index 92%
rename from src/Symfony/Component/Mailer/Transport/Http/Api/AbstractApiTransport.php
rename to src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php
index 081b5bdcc48ad..1700f1b81dcf5 100644
--- a/src/Symfony/Component/Mailer/Transport/Http/Api/AbstractApiTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php
@@ -9,12 +9,11 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Transport\Http\Api;
+namespace Symfony\Component\Mailer\Transport;
use Symfony\Component\Mailer\Exception\RuntimeException;
use Symfony\Component\Mailer\SentMessage;
use Symfony\Component\Mailer\SmtpEnvelope;
-use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
use Symfony\Component\Mime\Address;
use Symfony\Component\Mime\Email;
use Symfony\Component\Mime\MessageConverter;
diff --git a/src/Symfony/Component/Mailer/Transport/Http/AbstractHttpTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php
similarity index 94%
rename from src/Symfony/Component/Mailer/Transport/Http/AbstractHttpTransport.php
rename to src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php
index 885a4ccfea89d..6d2dd53dd9aba 100644
--- a/src/Symfony/Component/Mailer/Transport/Http/AbstractHttpTransport.php
+++ b/src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php
@@ -9,13 +9,12 @@
* file that was distributed with this source code.
*/
-namespace Symfony\Component\Mailer\Transport\Http;
+namespace Symfony\Component\Mailer\Transport;
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpClient\HttpClient;
use Symfony\Component\Mailer\Exception\HttpTransportException;
use Symfony\Component\Mailer\SentMessage;
-use Symfony\Component\Mailer\Transport\AbstractTransport;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\HttpClient\ResponseInterface;