Skip to content

Commit bc942d0

Browse files
Merge branch '4.3' into 4.4
* 4.3: [4.3] Cleanup tests Cleanup tests [Finder] Prevent unintentional file locks in Windows [FrameworkBundle] Fix about command not showing .env vars [DomCrawler] Fix FileFormField PHPDoc [Mailer] Remove the default dispatcher in AbstractTransport Fix #33395 PHP 5.3 compatibility
2 parents 5e1274d + 9693cf7 commit bc942d0

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Transport/AbstractTransport.php

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

1414
use Psr\Log\LoggerInterface;
1515
use Psr\Log\NullLogger;
16-
use Symfony\Component\EventDispatcher\EventDispatcher;
1716
use Symfony\Component\Mailer\DelayedSmtpEnvelope;
1817
use Symfony\Component\Mailer\Event\MessageEvent;
1918
use Symfony\Component\Mailer\Exception\TransportException;
@@ -35,7 +34,7 @@ abstract class AbstractTransport implements TransportInterface
3534

3635
public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
3736
{
38-
$this->dispatcher = $dispatcher ?: new EventDispatcher();
37+
$this->dispatcher = $dispatcher;
3938
$this->logger = $logger ?: new NullLogger();
4039
}
4140

@@ -67,14 +66,17 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
6766
}
6867
}
6968

70-
$event = new MessageEvent($message, $envelope, (string) $this);
71-
$this->dispatcher->dispatch($event);
72-
$envelope = $event->getEnvelope();
69+
if (null !== $this->dispatcher) {
70+
$event = new MessageEvent($message, $envelope, (string) $this);
71+
$this->dispatcher->dispatch($event);
72+
$envelope = $event->getEnvelope();
73+
}
74+
7375
if (!$envelope->getRecipients()) {
7476
return null;
7577
}
7678

77-
$message = new SentMessage($event->getMessage(), $envelope);
79+
$message = new SentMessage($message, $envelope);
7880
$this->doSend($message);
7981

8082
$this->checkThrottling();

0 commit comments

Comments
 (0)