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

Commitd39b078

Browse files
committed
[Mailer] Fix BC breaking event name change
1 parent00401ec commitd39b078

File tree

7 files changed

+31
-28
lines changed

7 files changed

+31
-28
lines changed

‎src/Symfony/Component/Mailer/Event/MessageEvent.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespaceSymfony\Component\Mailer\Event;
1313

1414
useSymfony\Component\Mailer\Envelope;
15+
useSymfony\Component\Messenger\Stamp\StampInterface;
1516
useSymfony\Component\Mime\RawMessage;
1617
useSymfony\Contracts\EventDispatcher\Event;
1718

@@ -20,12 +21,15 @@
2021
*
2122
* @author Fabien Potencier <fabien@symfony.com>
2223
*/
23-
class MessageEventextends Event
24+
finalclass MessageEventextends Event
2425
{
2526
privateRawMessage$message;
2627
privateEnvelope$envelope;
2728
privatestring$transport;
2829
privatebool$queued;
30+
31+
/** @var StampInterface[] */
32+
privatearray$stamps = [];
2933

3034
publicfunction__construct(RawMessage$message,Envelope$envelope,string$transport,bool$queued =false)
3135
{
@@ -64,4 +68,17 @@ public function isQueued(): bool
6468
{
6569
return$this->queued;
6670
}
71+
72+
publicfunctionaddStamp(StampInterface$stamp):void
73+
{
74+
$this->stamps[] =$stamp;
75+
}
76+
77+
/**
78+
* @return StampInterface[]
79+
*/
80+
publicfunctiongetStamps():array
81+
{
82+
return$this->stamps;
83+
}
6784
}

‎src/Symfony/Component/Mailer/Event/QueuingMessageEvent.php‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*
2121
* @author Fabien Potencier <fabien@symfony.com>
2222
*/
23-
finalclassQueuingMessageEventextends MessageEvent
23+
finalclassMessageEventextends MessageEvent
2424
{
2525
/** @var StampInterface[] */
2626
privatearray$stamps = [];
@@ -29,17 +29,4 @@ public function __construct(RawMessage $message, Envelope $envelope, string $tra
2929
{
3030
parent::__construct($message,$envelope,$transport,true);
3131
}
32-
33-
publicfunctionaddStamp(StampInterface$stamp):void
34-
{
35-
$this->stamps[] =$stamp;
36-
}
37-
38-
/**
39-
* @return StampInterface[]
40-
*/
41-
publicfunctiongetStamps():array
42-
{
43-
return$this->stamps;
44-
}
4532
}

‎src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
useSymfony\Component\EventDispatcher\EventSubscriberInterface;
1515
useSymfony\Component\Mailer\Event\MessageEvent;
1616
useSymfony\Component\Mailer\Event\MessageEvents;
17-
useSymfony\Component\Mailer\Event\QueuingMessageEvent;
1817
useSymfony\Contracts\Service\ResetInterface;
1918

2019
/**
@@ -50,7 +49,7 @@ public static function getSubscribedEvents(): array
5049
{
5150
return [
5251
MessageEvent::class => ['onMessage', -255],
53-
QueuingMessageEvent::class => ['onMessage', -255],
52+
MessageEvent::class => ['onMessage', -255],
5453
];
5554
}
5655
}

‎src/Symfony/Component/Mailer/EventListener/MessengerTransportListener.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespaceSymfony\Component\Mailer\EventListener;
1313

1414
useSymfony\Component\EventDispatcher\EventSubscriberInterface;
15-
useSymfony\Component\Mailer\Event\QueuingMessageEvent;
15+
useSymfony\Component\Mailer\Event\MessageEvent;
1616
useSymfony\Component\Messenger\Stamp\TransportNamesStamp;
1717
useSymfony\Component\Mime\Message;
1818

@@ -23,7 +23,7 @@
2323
*/
2424
finalclass MessengerTransportListenerimplements EventSubscriberInterface
2525
{
26-
publicfunctiononMessage(QueuingMessageEvent$event):void
26+
publicfunctiononMessage(MessageEvent$event):void
2727
{
2828
$message =$event->getMessage();
2929
if (!$messageinstanceof Message || !$message->getHeaders()->has('X-Bus-Transport')) {
@@ -39,7 +39,7 @@ public function onMessage(QueuingMessageEvent $event): void
3939
publicstaticfunctiongetSubscribedEvents():array
4040
{
4141
return [
42-
QueuingMessageEvent::class =>'onMessage',
42+
MessageEvent::class =>'onMessage',
4343
];
4444
}
4545
}

‎src/Symfony/Component/Mailer/Mailer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespaceSymfony\Component\Mailer;
1313

1414
usePsr\EventDispatcher\EventDispatcherInterface;
15+
useSymfony\Component\EventDispatcher\EventDispatcher;
1516
useSymfony\Component\Mailer\Event\MessageEvent;
16-
useSymfony\Component\Mailer\Event\QueuingMessageEvent;
1717
useSymfony\Component\Mailer\Exception\TransportExceptionInterface;
1818
useSymfony\Component\Mailer\Messenger\SendEmailMessage;
1919
useSymfony\Component\Mailer\Transport\TransportInterface;
@@ -54,7 +54,7 @@ public function send(RawMessage $message, Envelope $envelope = null): void
5454
// Listeners should act depending on the `$queued` argument of the `MessageEvent` instance.
5555
$clonedMessage =clone$message;
5656
$clonedEnvelope =null !==$envelope ?clone$envelope : Envelope::create($clonedMessage);
57-
$event =newQueuingMessageEvent($clonedMessage,$clonedEnvelope, (string)$this->transport);
57+
$event =newMessageEvent($clonedMessage,$clonedEnvelope, (string)$this->transport);
5858
$this->dispatcher->dispatch($event);
5959
$stamps =$event->getStamps();
6060
}

‎src/Symfony/Component/Mailer/Tests/EventListener/MessengerTransportListenerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
usePHPUnit\Framework\TestCase;
1515
useSymfony\Component\Mailer\Envelope;
16-
useSymfony\Component\Mailer\Event\QueuingMessageEvent;
16+
useSymfony\Component\Mailer\Event\MessageEvent;
1717
useSymfony\Component\Mailer\EventListener\MessengerTransportListener;
1818
useSymfony\Component\Messenger\Stamp\TransportNamesStamp;
1919
useSymfony\Component\Mime\Address;
@@ -27,7 +27,7 @@ public function testNoMessengerTransportStampsByDefault()
2727
$l =newMessengerTransportListener();
2828
$envelope =newEnvelope(newAddress('sender@example.com'), [newAddress('recipient@example.com')]);
2929
$message =newMessage(newHeaders());
30-
$event =newQueuingMessageEvent($message,$envelope,'smtp');
30+
$event =newMessageEvent($message,$envelope,'smtp');
3131
$l->onMessage($event);
3232
$this->assertEmpty($event->getStamps());
3333
}
@@ -38,7 +38,7 @@ public function testMessengerTransportStampViaHeader()
3838
$envelope =newEnvelope(newAddress('sender@example.com'), [newAddress('recipient@example.com')]);
3939
$headers = (newHeaders())->addTextHeader('X-Bus-Transport','async');
4040
$message =newMessage($headers);
41-
$event =newQueuingMessageEvent($message,$envelope,'smtp');
41+
$event =newMessageEvent($message,$envelope,'smtp',true);
4242
$l->onMessage($event);
4343
$this->assertCount(1,$event->getStamps());
4444
/* @var TransportNamesStamp $stamp */
@@ -54,7 +54,7 @@ public function testMessengerTransportStampsViaHeader()
5454
$name ='söme_very_long_and_weïrd transport name-for-messenger!';
5555
$headers = (newHeaders())->addTextHeader('X-Bus-Transport',' async , async1,'.$name);
5656
$message =newMessage($headers);
57-
$event =newQueuingMessageEvent($message,$envelope,'smtp');
57+
$event =newMessageEvent($message,$envelope,'smtp',true);
5858
$l->onMessage($event);
5959
$this->assertCount(1,$event->getStamps());
6060
/* @var TransportNamesStamp $stamp */

‎src/Symfony/Component/Mailer/Tests/MailerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
usePHPUnit\Framework\TestCase;
1515
usePsr\EventDispatcher\EventDispatcherInterface;
16-
useSymfony\Component\Mailer\Event\QueuingMessageEvent;
16+
useSymfony\Component\Mailer\Event\MessageEvent;
1717
useSymfony\Component\Mailer\Exception\LogicException;
1818
useSymfony\Component\Mailer\Mailer;
1919
useSymfony\Component\Mailer\Transport\NullTransport;
@@ -54,7 +54,7 @@ public function dispatch($message, array $stamps = []): Envelope
5454
$dispatcher =$this->createMock(EventDispatcherInterface::class);
5555
$dispatcher->expects($this->once())
5656
->method('dispatch')
57-
->with(self::callback(staticfunction (QueuingMessageEvent$event)use ($stamp) {
57+
->with(self::callback(staticfunction (MessageEvent$event)use ($stamp) {
5858
$event->addStamp($stamp);
5959

6060
return'Time for Symfony Mailer!' ===$event->getMessage()->getSubject();

0 commit comments

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