Skip to content

Commit 874aea2

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Fix CS [Mailer] Add Scaleway bridge [PsrHttpMessageBridge] Add native types where possible
2 parents 0edd760 + dcd9f9b commit 874aea2

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

Exception/UnsupportedSchemeException.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ class UnsupportedSchemeException extends LogicException
5252
'class' => Bridge\Postmark\Transport\PostmarkTransportFactory::class,
5353
'package' => 'symfony/postmark-mailer',
5454
],
55+
'scaleway' => [
56+
'class' => Bridge\Scaleway\Transport\ScalewayTransportFactory::class,
57+
'package' => 'symfony/scaleway-mailer',
58+
],
5559
'sendgrid' => [
5660
'class' => Bridge\Sendgrid\Transport\SendgridTransportFactory::class,
5761
'package' => 'symfony/sendgrid-mailer',

Tests/Exception/UnsupportedSchemeExceptionTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
2323
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
2424
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
25+
use Symfony\Component\Mailer\Bridge\Scaleway\Transport\ScalewayTransportFactory;
2526
use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
2627
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
2728
use Symfony\Component\Mailer\Transport\Dsn;
@@ -43,6 +44,7 @@ public static function setUpBeforeClass(): void
4344
MailjetTransportFactory::class => false,
4445
MandrillTransportFactory::class => false,
4546
PostmarkTransportFactory::class => false,
47+
ScalewayTransportFactory::class => false,
4648
SendgridTransportFactory::class => false,
4749
SesTransportFactory::class => false,
4850
]);
@@ -71,6 +73,7 @@ public static function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \
7173
yield ['mailjet', 'symfony/mailjet-mailer'];
7274
yield ['mandrill', 'symfony/mailchimp-mailer'];
7375
yield ['postmark', 'symfony/postmark-mailer'];
76+
yield ['scaleway', 'symfony/scaleway-mailer'];
7477
yield ['sendgrid', 'symfony/sendgrid-mailer'];
7578
yield ['ses', 'symfony/amazon-mailer'];
7679
}

Transport.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
2323
use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
2424
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
25+
use Symfony\Component\Mailer\Bridge\Scaleway\Transport\ScalewayTransportFactory;
2526
use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
2627
use Symfony\Component\Mailer\Exception\InvalidArgumentException;
2728
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
@@ -52,6 +53,7 @@ final class Transport
5253
MailjetTransportFactory::class,
5354
MandrillTransportFactory::class,
5455
PostmarkTransportFactory::class,
56+
ScalewayTransportFactory::class,
5557
SendgridTransportFactory::class,
5658
SesTransportFactory::class,
5759
];

0 commit comments

Comments
 (0)