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

Commitd2bc943

Browse files
committed
Introduce NullMessage and remove transport setter in MessageInterface
1 parent559ebe3 commitd2bc943

File tree

7 files changed

+49
-10
lines changed

7 files changed

+49
-10
lines changed

‎src/Symfony/Component/Notifier/Message/ChatMessage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function getOptions(): ?MessageOptionsInterface
7777
/**
7878
* @return $this
7979
*/
80-
publicfunctiontransport(?string$transport):MessageInterface
80+
publicfunctiontransport(?string$transport):self
8181
{
8282
$this->transport =$transport;
8383

‎src/Symfony/Component/Notifier/Message/EmailMessage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function getOptions(): ?MessageOptionsInterface
102102
/**
103103
* @return $this
104104
*/
105-
publicfunctiontransport(string$transport):MessageInterface
105+
publicfunctiontransport(string$transport):self
106106
{
107107
if (!$this->messageinstanceof Email) {
108108
thrownewLogicException('Cannot set a Transport on a RawMessage instance.');

‎src/Symfony/Component/Notifier/Message/MessageInterface.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,4 @@ public function getSubject(): string;
2525
publicfunctiongetOptions(): ?MessageOptionsInterface;
2626

2727
publicfunctiongetTransport(): ?string;
28-
29-
publicfunctiontransport(string$transport):self;
3028
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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+
declare(strict_types=1);
13+
14+
namespaceSymfony\Component\Notifier\Message;
15+
16+
finalclass NullMessageimplements MessageInterface
17+
{
18+
private$decoratedMessage;
19+
20+
publicfunction__construct(MessageInterface$message)
21+
{
22+
$this->decoratedMessage =$message;
23+
}
24+
25+
publicfunctiongetRecipientId(): ?string
26+
{
27+
return$this->decoratedMessage->getRecipientId();
28+
}
29+
30+
publicfunctiongetSubject():string
31+
{
32+
return$this->decoratedMessage->getSubject();
33+
}
34+
35+
publicfunctiongetOptions(): ?MessageOptionsInterface
36+
{
37+
return$this->decoratedMessage->getOptions();
38+
}
39+
40+
publicfunctiongetTransport(): ?string
41+
{
42+
return$this->decoratedMessage->getTransport() ??'null';
43+
}
44+
}

‎src/Symfony/Component/Notifier/Message/SmsMessage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function getSubject(): string
8383
/**
8484
* @return $this
8585
*/
86-
publicfunctiontransport(string$transport):MessageInterface
86+
publicfunctiontransport(string$transport):self
8787
{
8888
$this->transport =$transport;
8989

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
useSymfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
1616
useSymfony\Component\Notifier\Event\MessageEvent;
1717
useSymfony\Component\Notifier\Message\MessageInterface;
18+
useSymfony\Component\Notifier\Message\NullMessage;
1819
useSymfony\Component\Notifier\Message\SentMessage;
1920
useSymfony\Contracts\EventDispatcher\EventDispatcherInterface;
2021

@@ -34,9 +35,7 @@ public function __construct(EventDispatcherInterface $dispatcher = null)
3435

3536
publicfunctionsend(MessageInterface$message):SentMessage
3637
{
37-
if (null ===$message->getTransport()) {
38-
$message->transport((string)$this);
39-
}
38+
$message =newNullMessage($message);
4039

4140
if (null !==$this->dispatcher) {
4241
$this->dispatcher->dispatch(newMessageEvent($message));

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ public function send(MessageInterface $message): SentMessage
5757
if (!$transport =$message->getTransport()) {
5858
foreach ($this->transportsas$transportName =>$transport) {
5959
if ($transport->supports($message)) {
60-
$message->transport($transportName);
61-
6260
return$transport->send($message);
6361
}
6462
}

0 commit comments

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