[Messenger][DX] Rename bridges transport classes to be unique

Koc · Koc · commit bbf7e99e89c7 · 2019-07-19T01:02:22.000+03:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -77,7 +77,7 @@
 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\Amazon\Transport\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;
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
@@ -9,10 +9,13 @@
  * 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 +58,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/Transport/SesApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
@@ -9,7 +9,7 @@
  * 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;
@@ -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/Transport/SesHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php
@@ -9,7 +9,7 @@
  * 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;
@@ -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/Transport/SesSmtpTransport.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/Transport/SesTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php
@@ -9,7 +9,7 @@
  * 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;
@@ -30,15 +30,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/Exception/UnsupportedHostException.php b/src/Symfony/Component/Mailer/Exception/UnsupportedHostException.php
@@ -37,7 +37,7 @@ class UnsupportedHostException extends LogicException
             'package' => 'symfony/sendgrid-mailer',
         ],
         'ses' => [
-            'class' => Bridge\Amazon\Factory\SesTransportFactory::class,
+            'class' => Bridge\Amazon\Transport\SesTransportFactory::class,
             'package' => 'symfony/amazon-mailer',
         ],
         'mandrill' => [
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Mailer;
 
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Mailer\Bridge\Amazon\Factory\SesTransportFactory;
+use Symfony\Component\Mailer\Bridge\Amazon\Transport\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;
