[Mailer] return SentMessage from Mailer::send if available

symfony · pableu · Oct 11, 2020 · Oct 11, 2020 · Oct 11, 2020 · 2fa6378bbfbb5a46dff1ffaf76301ef66e7aa9df
commit 2fa6378bbfbb5a46dff1ffaf76301ef66e7aa9df
diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php
@@ -36,12 +36,10 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
         $this->dispatcher = class_exists(Event::class) ? LegacyEventDispatcherProxy::decorate($dispatcher) : $dispatcher;
     }
 
-    public function send(RawMessage $message, Envelope $envelope = null): void
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
     {
         if (null === $this->bus) {
-            $this->transport->send($message, $envelope);
-
-            return;
+            return $this->transport->send($message, $envelope);
         }
 
         if (null !== $this->dispatcher) {

diff --git a/src/Symfony/Component/Mailer/MailerInterface.php b/src/Symfony/Component/Mailer/MailerInterface.php
@@ -26,5 +26,5 @@ interface MailerInterface
     /**
      * @throws TransportExceptionInterface
      */
-    public function send(RawMessage $message, Envelope $envelope = null): void;
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage;
 }
diff --git a/src/Symfony/Component/Mailer/Tests/MailerTest.php b/src/Symfony/Component/Mailer/Tests/MailerTest.php
@@ -14,18 +14,31 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\Mailer;
+use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\TransportInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Mime\RawMessage;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class MailerTest extends TestCase
 {
-    public function testSendingRawMessages()
+    public function testSendingRawMessagesWithMessenger()
     {
         $this->expectException(LogicException::class);
 
         $transport = new Mailer($this->createMock(TransportInterface::class), $this->createMock(MessageBusInterface::class), $this->createMock(EventDispatcherInterface::class));
         $transport->send(new RawMessage('Some raw email message'));
     }
+
+    public function testSendingRawMessagesWithoutMessenger()
+    {
+        $transportMock = $this->createMock(TransportInterface::class);
+        $transportMock
+            ->expects(self::once())
+            ->method('send')
+            ->willReturn($this->createMock(SentMessage::class));
+        $transport = new Mailer($transportMock, null, $this->createMock(EventDispatcherInterface::class));
+        $result = $transport->send(new RawMessage('Some raw email message without messenger'));
+        self::assertInstanceOf(SentMessage::class, $result);
+    }
 }