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

Commit55d6a65

Browse files
committed
[Mailer] Remove the default dispatcher in AbstractTransport
1 parent28f4c09 commit55d6a65

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

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

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

1414
usePsr\Log\LoggerInterface;
1515
usePsr\Log\NullLogger;
16-
useSymfony\Component\EventDispatcher\EventDispatcher;
1716
useSymfony\Component\EventDispatcher\EventDispatcherInterface;
1817
useSymfony\Component\Mailer\DelayedSmtpEnvelope;
1918
useSymfony\Component\Mailer\Event\MessageEvent;
@@ -37,7 +36,7 @@ abstract class AbstractTransport implements TransportInterface
3736

3837
publicfunction__construct(EventDispatcherInterface$dispatcher =null,LoggerInterface$logger =null)
3938
{
40-
$this->dispatcher =$dispatcher ?:newEventDispatcher();
39+
$this->dispatcher =$dispatcher;
4140
$this->logger =$logger ?:newNullLogger();
4241
}
4342

@@ -69,14 +68,18 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
6968
}
7069
}
7170

72-
$event =newMessageEvent($message,$envelope);
73-
$this->dispatcher->dispatch($event);
74-
$envelope =$event->getEnvelope();
71+
if (null !==$this->dispatcher) {
72+
$event =newMessageEvent($message,$envelope);
73+
$this->dispatcher->dispatch($event);
74+
$envelope =$event->getEnvelope();
75+
$message =$event->getMessage();
76+
}
77+
7578
if (!$envelope->getRecipients()) {
7679
returnnull;
7780
}
7881

79-
$message =newSentMessage($event->getMessage(),$envelope);
82+
$message =newSentMessage($message,$envelope);
8083
$this->doSend($message);
8184

8285
$this->checkThrottling();

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp