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

Commit51941e0

Browse files
committed
add SentMessageEvent
1 parentf2b98b4 commit51941e0

File tree

7 files changed

+186
-3
lines changed

7 files changed

+186
-3
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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\Notifier\Event;
13+
14+
useSymfony\Component\Notifier\Message\MessageInterface;
15+
16+
/**
17+
* @author Smaïne Milianni <smaine.milianni@gmail.com>
18+
*/
19+
finalclass FailedMessageEvent
20+
{
21+
private$message;
22+
private$error;
23+
24+
publicfunction__construct(MessageInterface$message,\Throwable$error)
25+
{
26+
$this->message =$message;
27+
$this->error =$error;
28+
}
29+
30+
publicfunctiongetMessage():MessageInterface
31+
{
32+
return$this->message;
33+
}
34+
35+
publicfunctiongetError():\Throwable
36+
{
37+
return$this->error;
38+
}
39+
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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\Notifier\Event;
13+
14+
useSymfony\Component\Notifier\Message\SentMessage;
15+
useSymfony\Contracts\EventDispatcher\Event;
16+
17+
/**
18+
* @author Smaïne Milianni <smaine.milianni@gmail.com>
19+
*/
20+
finalclass SentMessageEventextends Event
21+
{
22+
private$message;
23+
24+
publicfunction__construct(SentMessage$message)
25+
{
26+
$this->message =$message;
27+
}
28+
29+
publicfunctiongetMessage():SentMessage
30+
{
31+
return$this->message;
32+
}
33+
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
3+
namespaceSymfony\Component\Notifier\Tests\Event;
4+
5+
usePHPUnit\Framework\TestCase;
6+
useSymfony\Component\Mime\RawMessage;
7+
useSymfony\Component\Notifier\Event\FailedMessageEvent;
8+
useSymfony\Component\Notifier\Message\ChatMessage;
9+
useSymfony\Component\Notifier\Message\EmailMessage;
10+
useSymfony\Component\Notifier\Message\MessageInterface;
11+
useSymfony\Component\Notifier\Message\SmsMessage;
12+
13+
/**
14+
* @author Smaïne Milianni <smaine.milianni@gmail.com>
15+
*/
16+
class FailedMessageEventTestextends TestCase
17+
{
18+
/**
19+
* @dataProvider dataprovider
20+
*/
21+
publicfunctiontestConstruct(MessageInterface$message,\Throwable$error,FailedMessageEvent$event)
22+
{
23+
$this->assertEquals($event,newFailedMessageEvent($message,$error));
24+
}
25+
26+
/**
27+
* @dataProvider dataprovider
28+
*/
29+
publicfunctiontestGetMessage(MessageInterface$message,\Throwable$error,FailedMessageEvent$event)
30+
{
31+
$this->assertEquals($message,$event->getMessage());
32+
}
33+
34+
/**
35+
* @dataProvider dataprovider
36+
*/
37+
publicfunctiontestGetError(MessageInterface$message,\Throwable$error,FailedMessageEvent$event)
38+
{
39+
$this->assertEquals($error,$event->getError());
40+
}
41+
42+
publicfunctiondataprovider():iterable
43+
{
44+
yield [$message =newChatMessage('subject'),$error =new \RuntimeException(),newFailedMessageEvent($message,$error)];
45+
yield [$message =newEmailMessage(newRawMessage('subject')),$error =new \ErrorException(),newFailedMessageEvent($message,$error)];
46+
yield [$message =newSmsMessage('+3312345678','subject'),$error =new \Exception(),newFailedMessageEvent($message,$error)];
47+
}
48+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
namespaceSymfony\Component\Notifier\Tests\Event;
4+
5+
usePHPUnit\Framework\TestCase;
6+
useSymfony\Component\Mime\RawMessage;
7+
useSymfony\Component\Notifier\Event\SentMessageEvent;
8+
useSymfony\Component\Notifier\Message\ChatMessage;
9+
useSymfony\Component\Notifier\Message\EmailMessage;
10+
useSymfony\Component\Notifier\Message\SentMessage;
11+
useSymfony\Component\Notifier\Message\SmsMessage;
12+
13+
/**
14+
* @author Smaïne Milianni <smaine.milianni@gmail.com>
15+
*/
16+
class SentMessageEventTestextends TestCase
17+
{
18+
/**
19+
* @dataProvider dataprovider
20+
*/
21+
publicfunctiontestConstruct(SentMessage$message,SentMessageEvent$event)
22+
{
23+
$this->assertEquals($event,newSentMessageEvent($message));
24+
}
25+
26+
/**
27+
* @dataProvider dataprovider
28+
*/
29+
publicfunctiontestGetMessage(SentMessage$message,SentMessageEvent$event)
30+
{
31+
$this->assertEquals($message,$event->getMessage());
32+
}
33+
34+
publicfunctiondataprovider():iterable
35+
{
36+
yield [$message =newSentMessage(newChatMessage('subject'),'null_transport'),newSentMessageEvent($message)];
37+
yield [$message =newSentMessage(newEmailMessage(newRawMessage('subject')),'null_transport'),newSentMessageEvent($message)];
38+
yield [$message =newSentMessage(newSmsMessage('+3312345678','subject'),'null_transport'),newSentMessageEvent($message)];
39+
}
40+
}

‎src/Symfony/Component/Notifier/Tests/Transport/NullTransportTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testSend()
3131
$eventDispatcherMock =$this->createMock(EventDispatcherInterface::class)
3232
);
3333

34-
$eventDispatcherMock->expects($this->once())->method('dispatch');
34+
$eventDispatcherMock->expects($this->exactly(2))->method('dispatch');
3535
$nullTransport->send(newDummyMessage());
3636
}
3737
}

‎src/Symfony/Component/Notifier/Transport/AbstractTransport.php‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
useSymfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1616
useSymfony\Component\HttpClient\HttpClient;
1717
useSymfony\Component\Notifier\Event\MessageEvent;
18+
useSymfony\Component\Notifier\Event\SentMessageEvent;
1819
useSymfony\Component\Notifier\Exception\LogicException;
20+
useSymfony\Component\Notifier\Message\FailedMessageEvent;
1921
useSymfony\Component\Notifier\Message\MessageInterface;
2022
useSymfony\Component\Notifier\Message\SentMessage;
2123
useSymfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -76,7 +78,21 @@ public function send(MessageInterface $message): SentMessage
7678
$this->dispatcher->dispatch(newMessageEvent($message));
7779
}
7880

79-
return$this->doSend($message);
81+
try {
82+
$sentMessage =$this->doSend($message);
83+
}catch (\Throwable$error) {
84+
if (null !==$this->dispatcher) {
85+
$this->dispatcher->dispatch(newFailedMessageEvent($message,$error));
86+
}
87+
88+
throw$error;
89+
}
90+
91+
if (null !==$this->dispatcher) {
92+
$this->dispatcher->dispatch(newSentMessageEvent($sentMessage));
93+
}
94+
95+
return$sentMessage;
8096
}
8197

8298
abstractprotectedfunctiondoSend(MessageInterface$message):SentMessage;

‎src/Symfony/Component/Notifier/Transport/NullTransport.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
useSymfony\Component\EventDispatcher\Event;
1515
useSymfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1616
useSymfony\Component\Notifier\Event\MessageEvent;
17+
useSymfony\Component\Notifier\Event\SentMessageEvent;
1718
useSymfony\Component\Notifier\Message\MessageInterface;
1819
useSymfony\Component\Notifier\Message\NullMessage;
1920
useSymfony\Component\Notifier\Message\SentMessage;
@@ -41,7 +42,13 @@ public function send(MessageInterface $message): SentMessage
4142
$this->dispatcher->dispatch(newMessageEvent($message));
4243
}
4344

44-
returnnewSentMessage($message, (string)$this);
45+
$sentMessage =newSentMessage($message, (string)$this);
46+
47+
if (null !==$this->dispatcher) {
48+
$this->dispatcher->dispatch(newSentMessageEvent($sentMessage));
49+
}
50+
51+
return$sentMessage;
4552
}
4653

4754
publicfunction__toString():string

0 commit comments

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