[Mailer] Split standard transports per sub-namespaces

Koc · Koc · commit b9dd600ffd4a · 2019-07-22T23:10:14.000+03:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.xml
@@ -35,11 +35,11 @@
             <tag name="mailer.transport_factory" />
         </service>
 
-        <service id="mailer.transport_factory.null" class="Symfony\Component\Mailer\Transport\NullTransportFactory" parent="mailer.transport_factory.abstract">
+        <service id="mailer.transport_factory.null" class="Symfony\Component\Mailer\Transport\Null\NullTransportFactory" parent="mailer.transport_factory.abstract">
             <tag name="mailer.transport_factory" />
         </service>
 
-        <service id="mailer.transport_factory.sendmail" class="Symfony\Component\Mailer\Transport\SendmailTransportFactory" parent="mailer.transport_factory.abstract">
+        <service id="mailer.transport_factory.sendmail" class="Symfony\Component\Mailer\Transport\Sendmail\SendmailTransportFactory" parent="mailer.transport_factory.abstract">
             <tag name="mailer.transport_factory" />
         </service>
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php
@@ -14,7 +14,7 @@
 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;
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -4,6 +4,10 @@ CHANGELOG
 4.4.0
 -----
 
+ * [BC BREAK] Classes `AbstractApiTransport` and `AbstractHttpTransport` moved under `Transport` sub-namespace.
+ * [BC BREAK] Classes `FailoverTransport` and `RoundRobinTransport` moved under `Chain` sub-namespace.
+ * [BC BREAK] Class `NullTransport` moved under `Null` sub-namespace.
+ * [BC BREAK] Class `SendmailTransport` moved under `Sendmail` 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/Tests/Transport/AbstractTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
@@ -13,7 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\SmtpEnvelope;
-use Symfony\Component\Mailer\Transport\NullTransport;
+use Symfony\Component\Mailer\Transport\Null\NullTransport;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\RawMessage;
 
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Chain/FailoverTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Chain/FailoverTransportTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Tests\Transport;
+namespace Symfony\Component\Mailer\Tests\Transport\Chain;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\Exception\TransportException;
-use Symfony\Component\Mailer\Transport\FailoverTransport;
-use Symfony\Component\Mailer\Transport\RoundRobinTransport;
+use Symfony\Component\Mailer\Transport\Chain\FailoverTransport;
+use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Mime\RawMessage;
 
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Chain/RoundRobinTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Chain/RoundRobinTransportTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Tests\Transport;
+namespace Symfony\Component\Mailer\Tests\Transport\Chain;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\Exception\TransportException;
-use Symfony\Component\Mailer\Transport\RoundRobinTransport;
+use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Mime\RawMessage;
 
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Null/NullTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Null/NullTransportFactoryTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Tests\Transport;
+namespace Symfony\Component\Mailer\Tests\Transport\Null;
 
 use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;
 use Symfony\Component\Mailer\Transport\Dsn;
-use Symfony\Component\Mailer\Transport\NullTransport;
-use Symfony\Component\Mailer\Transport\NullTransportFactory;
+use Symfony\Component\Mailer\Transport\Null\NullTransport;
+use Symfony\Component\Mailer\Transport\Null\NullTransportFactory;
 use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
 
 class NullTransportFactoryTest extends TransportFactoryTestCase
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/Sendmail/SendmailTransportFactoryTest.php b/src/Symfony/Component/Mailer/Tests/Transport/Sendmail/SendmailTransportFactoryTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Tests\Transport;
+namespace Symfony\Component\Mailer\Tests\Transport\Sendmail;
 
 use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;
 use Symfony\Component\Mailer\Transport\Dsn;
-use Symfony\Component\Mailer\Transport\SendmailTransport;
-use Symfony\Component\Mailer\Transport\SendmailTransportFactory;
+use Symfony\Component\Mailer\Transport\Sendmail\SendmailTransport;
+use Symfony\Component\Mailer\Transport\Sendmail\SendmailTransportFactory;
 use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
 
 class SendmailTransportFactoryTest extends TransportFactoryTestCase
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mailer\Transport;
+use Symfony\Component\Mailer\Transport\Chain\FailoverTransport;
+use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
 use Symfony\Component\Mailer\Transport\Dsn;
 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
@@ -19,9 +19,11 @@
 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\Chain\FailoverTransport;
+use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
 use Symfony\Component\Mailer\Transport\Dsn;
-use Symfony\Component\Mailer\Transport\NullTransportFactory;
-use Symfony\Component\Mailer\Transport\SendmailTransportFactory;
+use Symfony\Component\Mailer\Transport\Null\NullTransportFactory;
+use Symfony\Component\Mailer\Transport\Sendmail\SendmailTransportFactory;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransportFactory;
 use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
 use Symfony\Component\Mailer\Transport\TransportInterface;
@@ -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/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/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;
diff --git a/src/Symfony/Component/Mailer/Transport/Chain/FailoverTransport.php b/src/Symfony/Component/Mailer/Transport/Chain/FailoverTransport.php
@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Transport;
+namespace Symfony\Component\Mailer\Transport\Chain;
+
+use Symfony\Component\Mailer\Transport\TransportInterface;
 
 /**
  * Uses several Transports using a failover algorithm.
diff --git a/src/Symfony/Component/Mailer/Transport/Chain/RoundRobinTransport.php b/src/Symfony/Component/Mailer/Transport/Chain/RoundRobinTransport.php
@@ -9,12 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Transport;
+namespace Symfony\Component\Mailer\Transport\Chain;
 
 use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\SmtpEnvelope;
+use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Mime\RawMessage;
 
 /**
diff --git a/src/Symfony/Component/Mailer/Transport/Null/NullTransport.php b/src/Symfony/Component/Mailer/Transport/Null/NullTransport.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Transport;
+namespace Symfony\Component\Mailer\Transport\Null;
 
 use Symfony\Component\Mailer\SentMessage;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
 
 /**
  * Pretends messages have been sent, but just ignores them.
diff --git a/src/Symfony/Component/Mailer/Transport/Null/NullTransportFactory.php b/src/Symfony/Component/Mailer/Transport/Null/NullTransportFactory.php
@@ -9,9 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Transport;
+namespace Symfony\Component\Mailer\Transport\Null;
 
 use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
+use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
+use Symfony\Component\Mailer\Transport\Dsn;
+use Symfony\Component\Mailer\Transport\TransportInterface;
 
 /**
  * @author Konstantin Myakshin <molodchick@gmail.com>
diff --git a/src/Symfony/Component/Mailer/Transport/Sendmail/SendmailTransport.php b/src/Symfony/Component/Mailer/Transport/Sendmail/SendmailTransport.php
@@ -9,11 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Transport;
+namespace Symfony\Component\Mailer\Transport\Sendmail;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\SmtpEnvelope;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
 use Symfony\Component\Mailer\Transport\Smtp\SmtpTransport;
 use Symfony\Component\Mailer\Transport\Smtp\Stream\AbstractStream;
 use Symfony\Component\Mailer\Transport\Smtp\Stream\ProcessStream;
diff --git a/src/Symfony/Component/Mailer/Transport/Sendmail/SendmailTransportFactory.php b/src/Symfony/Component/Mailer/Transport/Sendmail/SendmailTransportFactory.php
@@ -9,9 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Mailer\Transport;
+namespace Symfony\Component\Mailer\Transport\Sendmail;
 
 use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
+use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
+use Symfony\Component\Mailer\Transport\Dsn;
+use Symfony\Component\Mailer\Transport\TransportInterface;
 
 /**
  * @author Konstantin Myakshin <molodchick@gmail.com>
