Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3f0a8de

Browse files
committed
[Mailer] Add a way to change the Bus transport dynamically
1 parentbe9f9da commit3f0a8de

File tree

6 files changed

+123
-2
lines changed

6 files changed

+123
-2
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
useSymfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
103103
useSymfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
104104
useSymfony\Component\Mailer\Command\MailerTestCommand;
105+
useSymfony\Component\Mailer\EventListener\MessengerTransportListener;
105106
useSymfony\Component\Mailer\Mailer;
106107
useSymfony\Component\Mercure\HubRegistry;
107108
useSymfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -2486,6 +2487,10 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
24862487
}else {
24872488
$container->removeDefinition('mailer.message_listener');
24882489
}
2490+
2491+
if (!class_exists(MessengerTransportListener::class)) {
2492+
$container->removeDefinition('mailer.messenger_transport_listener');
2493+
}
24892494
}
24902495

24912496
privatefunctionregisterNotifierConfiguration(array$config,ContainerBuilder$container,PhpFileLoader$loader)

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
useSymfony\Component\Mailer\EventListener\EnvelopeListener;
1616
useSymfony\Component\Mailer\EventListener\MessageListener;
1717
useSymfony\Component\Mailer\EventListener\MessageLoggerListener;
18+
useSymfony\Component\Mailer\EventListener\MessengerTransportListener;
1819
useSymfony\Component\Mailer\Mailer;
1920
useSymfony\Component\Mailer\MailerInterface;
2021
useSymfony\Component\Mailer\Messenger\MessageHandler;
@@ -74,6 +75,9 @@
7475
->tag('kernel.event_subscriber')
7576
->tag('kernel.reset', ['method' =>'reset'])
7677

78+
->set('mailer.messenger_transport_listener', MessengerTransportListener::class)
79+
->tag('kernel.event_subscriber')
80+
7781
->set('console.command.mailer_test', MailerTestCommand::class)
7882
->args([
7983
service('mailer.transports'),

‎src/Symfony/Bundle/FrameworkBundle/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"symfony/html-sanitizer":"^6.1",
4848
"symfony/http-client":"^5.4|^6.0",
4949
"symfony/lock":"^5.4|^6.0",
50-
"symfony/mailer":"^5.4|^6.0",
50+
"symfony/mailer":"^6.2",
5151
"symfony/messenger":"^6.1",
5252
"symfony/mime":"^5.4|^6.0",
5353
"symfony/notifier":"^5.4|^6.0",
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespaceSymfony\Component\Mailer\EventListener;
13+
14+
useSymfony\Component\EventDispatcher\EventSubscriberInterface;
15+
useSymfony\Component\Mailer\Event\QueuingMessageEvent;
16+
useSymfony\Component\Messenger\Stamp\TransportNamesStamp;
17+
useSymfony\Component\Mime\Message;
18+
19+
/**
20+
* Allows messages to be send to specific Messenger transports via the "X-Bus-Transport" MIME header.
21+
*
22+
* @author Fabien Potencier <fabien@symfony.com>
23+
*/
24+
class MessengerTransportListenerimplements EventSubscriberInterface
25+
{
26+
publicfunctiononMessage(QueuingMessageEvent$event):void
27+
{
28+
$message =$event->getMessage();
29+
if (!$messageinstanceof Message || !$message->getHeaders()->has('X-Bus-Transport')) {
30+
return;
31+
}
32+
33+
$names = [];
34+
foreach (explode(',',$message->getHeaders()->get('X-Bus-Transport')->getBody())as$name) {
35+
$names[] =trim($name);
36+
}
37+
$event->addStamp(newTransportNamesStamp($names));
38+
$message->getHeaders()->remove('X-Bus-Transport');
39+
}
40+
41+
publicstaticfunctiongetSubscribedEvents():array
42+
{
43+
return [
44+
QueuingMessageEvent::class =>'onMessage',
45+
];
46+
}
47+
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespaceSymfony\Component\Mailer\Tests\EventListener;
13+
14+
usePHPUnit\Framework\TestCase;
15+
useSymfony\Component\Mailer\Envelope;
16+
useSymfony\Component\Mailer\Event\QueuingMessageEvent;
17+
useSymfony\Component\Mailer\EventListener\MessengerTransportListener;
18+
useSymfony\Component\Messenger\Stamp\TransportNamesStamp;
19+
useSymfony\Component\Mime\Address;
20+
useSymfony\Component\Mime\Header\Headers;
21+
useSymfony\Component\Mime\Message;
22+
23+
class MessengerTransportListenerTestextends TestCase
24+
{
25+
publicfunctiontestNoMessengerTransportStampsByDefault()
26+
{
27+
$l =newMessengerTransportListener();
28+
$envelope =newEnvelope(newAddress('sender@example.com'), [newAddress('recipient@example.com')]);
29+
$message =newMessage(newHeaders());
30+
$event =newQueuingMessageEvent($message,$envelope,'smtp');
31+
$l->onMessage($event);
32+
$this->assertEmpty($event->getStamps());
33+
}
34+
35+
publicfunctiontestMessengerTransportStampViaHeader()
36+
{
37+
$l =newMessengerTransportListener();
38+
$envelope =newEnvelope(newAddress('sender@example.com'), [newAddress('recipient@example.com')]);
39+
$headers = (newHeaders())->addTextHeader('X-Bus-Transport','async');
40+
$message =newMessage($headers);
41+
$event =newQueuingMessageEvent($message,$envelope,'smtp');
42+
$l->onMessage($event);
43+
$this->assertCount(1,$event->getStamps());
44+
/* @var TransportNamesStamp $stamp */
45+
$this->assertInstanceOf(TransportNamesStamp::class,$stamp =$event->getStamps()[0]);
46+
$this->assertSame(['async'],$stamp->getTransportNames());
47+
$this->assertTrue($headers->has('X-Bus-Transport'));
48+
}
49+
50+
publicfunctiontestMessengerTransportStampsViaHeader()
51+
{
52+
$l =newMessengerTransportListener();
53+
$envelope =newEnvelope(newAddress('sender@example.com'), [newAddress('recipient@example.com')]);
54+
$name ='söme_very_long_and_weïrd transport name-for-messenger!';
55+
$headers = (newHeaders())->addTextHeader('X-Bus-Transport',' async , async1,'.$name);
56+
$message =newMessage($headers);
57+
$event =newQueuingMessageEvent($message,$envelope,'smtp');
58+
$l->onMessage($event);
59+
$this->assertCount(1,$event->getStamps());
60+
/* @var TransportNamesStamp $stamp */
61+
$this->assertInstanceOf(TransportNamesStamp::class,$stamp =$event->getStamps()[0]);
62+
$this->assertSame(['async','async1',$name],$stamp->getTransportNames());
63+
}
64+
}

‎src/Symfony/Component/Mailer/composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"symfony/messenger":"^5.4|^6.0"
3131
},
3232
"conflict": {
33-
"symfony/http-kernel":"<5.4"
33+
"symfony/http-kernel":"<5.4",
34+
"symfony/messenger":"<6.2"
3435
},
3536
"autoload": {
3637
"psr-4": {"Symfony\\Component\\Mailer\\":"" },

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp