[Mailer] Remove the default dispatcher in AbstractTransport

fabpot · fabpot · commit 55d6a65df9c1 · 2019-08-30T19:29:56.000+02:00
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
@@ -13,7 +13,6 @@
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Mailer\DelayedSmtpEnvelope;
 use Symfony\Component\Mailer\Event\MessageEvent;
@@ -37,7 +36,7 @@ abstract class AbstractTransport implements TransportInterface
 
     public function __construct(EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
-        $this->dispatcher = $dispatcher ?: new EventDispatcher();
+        $this->dispatcher = $dispatcher;
         $this->logger = $logger ?: new NullLogger();
     }
 
@@ -69,14 +68,18 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
             }
         }
 
-        $event = new MessageEvent($message, $envelope);
-        $this->dispatcher->dispatch($event);
-        $envelope = $event->getEnvelope();
+        if (null !== $this->dispatcher) {
+            $event = new MessageEvent($message, $envelope);
+            $this->dispatcher->dispatch($event);
+            $envelope = $event->getEnvelope();
+            $message = $event->getMessage();
+        }
+
         if (!$envelope->getRecipients()) {
             return null;
         }
 
-        $message = new SentMessage($event->getMessage(), $envelope);
+        $message = new SentMessage($message, $envelope);
         $this->doSend($message);
 
         $this->checkThrottling();
