[Mailer] Improve an exception when trying to send a RawMessage without an Envelope

fabpot · fabpot · commit 94a54ca50f35 · 2019-09-04T08:16:27.000+02:00
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mailer\Tests\Transport;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mailer\Transport\NullTransport;
 use Symfony\Component\Mime\Address;
@@ -46,4 +47,12 @@ public function testThrottling()
         $transport->send($message, $envelope);
         $this->assertEqualsWithDelta(0, time() - $start, 1);
     }
+
+    public function testSendingRawMessages()
+    {
+        $this->expectException(LogicException::class);
+
+        $transport = new NullTransport();
+        $transport->send(new RawMessage('Some raw email message'));
+    }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php
@@ -16,6 +16,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Mailer\DelayedSmtpEnvelope;
 use Symfony\Component\Mailer\Event\MessageEvent;
+use Symfony\Component\Mailer\Exception\LogicException;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\SmtpEnvelope;
@@ -59,6 +60,8 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
         $message = clone $message;
         if (null !== $envelope) {
             $envelope = clone $envelope;
+        } elseif (RawMessage::class === \get_class($message)) {
+            throw new LogicException('Cannot send a RawMessage instance without an explicit Envelope.');
         } else {
             try {
                 $envelope = new DelayedSmtpEnvelope($message);
