minor #46542 [Mailer] Sort transports alphabetically (OskarStark)

fabpot · fabpot · commit 18aea6305169 · 2022-06-02T20:07:58.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Mailer] Sort transports alphabetically | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Spotted in #46211 | License | MIT | Doc PR | - So the sorting does not needs to be done in #46211 cc @B-Galati Commits ------- 5d76dbb [Mailer] Sort transports alphabetically
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2437,11 +2437,11 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
             MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
             MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
             MandrillTransportFactory::class => 'mailer.transport_factory.mailchimp',
+            OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
             PostmarkTransportFactory::class => 'mailer.transport_factory.postmark',
             SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
             SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
             SesTransportFactory::class => 'mailer.transport_factory.amazon',
-            OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
         ];
 
         foreach ($classToServices as $class => $service) {
diff --git a/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Mailer/Exception/UnsupportedSchemeException.php
@@ -36,6 +36,10 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Mailchimp\Transport\MandrillTransportFactory::class,
             'package' => 'symfony/mailchimp-mailer',
         ],
+        'ohmysmtp' => [
+            'class' => Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory::class,
+            'package' => 'symfony/oh-my-smtp-mailer',
+        ],
         'postmark' => [
             'class' => Bridge\Postmark\Transport\PostmarkTransportFactory::class,
             'package' => 'symfony/postmark-mailer',
@@ -52,10 +56,6 @@ class UnsupportedSchemeException extends LogicException
             'class' => Bridge\Amazon\Transport\SesTransportFactory::class,
             'package' => 'symfony/amazon-mailer',
         ],
-        'ohmysmtp' => [
-            'class' => Bridge\OhMySmtp\Transport\OhMySmtpTransportFactory::class,
-            'package' => 'symfony/oh-my-smtp-mailer',
-        ],
     ];
 
     public function __construct(Dsn $dsn, string $name = null, array $supported = [])
diff --git a/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php b/src/Symfony/Component/Mailer/Tests/Exception/UnsupportedSchemeExceptionTest.php
@@ -38,10 +38,10 @@ public static function setUpBeforeClass(): void
             MailgunTransportFactory::class => false,
             MailjetTransportFactory::class => false,
             MandrillTransportFactory::class => false,
+            OhMySmtpTransportFactory::class => false,
             PostmarkTransportFactory::class => false,
             SendgridTransportFactory::class => false,
             SendinblueTransportFactory::class => false,
-            OhMySmtpTransportFactory::class => false,
             SesTransportFactory::class => false,
         ]);
     }
@@ -65,10 +65,10 @@ public function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \Generat
         yield ['mailgun', 'symfony/mailgun-mailer'];
         yield ['mailjet', 'symfony/mailjet-mailer'];
         yield ['mandrill', 'symfony/mailchimp-mailer'];
+        yield ['ohmysmtp', 'symfony/oh-my-smtp-mailer'];
         yield ['postmark', 'symfony/postmark-mailer'];
         yield ['sendgrid', 'symfony/sendgrid-mailer'];
         yield ['sendinblue', 'symfony/sendinblue-mailer'];
-        yield ['ohmysmtp', 'symfony/oh-my-smtp-mailer'];
         yield ['ses', 'symfony/amazon-mailer'];
     }
 
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
@@ -49,10 +49,10 @@ class Transport
         MailgunTransportFactory::class,
         MailjetTransportFactory::class,
         MandrillTransportFactory::class,
+        OhMySmtpTransportFactory::class,
         PostmarkTransportFactory::class,
         SendgridTransportFactory::class,
         SendinblueTransportFactory::class,
-        OhMySmtpTransportFactory::class,
         SesTransportFactory::class,
     ];
 
