[Mailer] Added support for WrappedMessage

sstok · sstok · commit 37033a300875 · 2019-04-28T13:52:30.000+02:00
When a transporter doesn’t support a raw message, it falls back to the original message
diff --git a/src/Symfony/Component/Mailer/SmtpEnvelope.php b/src/Symfony/Component/Mailer/SmtpEnvelope.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\NamedAddress;
 use Symfony\Component\Mime\RawMessage;
+use Symfony\Component\Mime\WrappedMessage;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -40,6 +41,10 @@ public function __construct(Address $sender, array $recipients)
 
     public static function create(RawMessage $message): self
     {
+        if ($message instanceof WrappedMessage) {
+            $message = $message->getOriginalMessage();
+        }
+
         if ($message instanceof Message) {
             $headers = $message->getHeaders();
 
diff --git a/src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php b/src/Symfony/Component/Mailer/Tests/SmtpEnvelopeTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Mime\Message;
 use Symfony\Component\Mime\NamedAddress;
 use Symfony\Component\Mime\RawMessage;
+use Symfony\Component\Mime\WrappedMessage;
 
 class SmtpEnvelopeTest extends TestCase
 {
@@ -72,6 +73,16 @@ public function testSenderFromHeaders()
         $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
     }
 
+    public function testCreateFromWrappedMessage()
+    {
+        $headers = new Headers();
+        $headers->addMailboxListHeader('From', ['from@symfony.com', 'some@symfony.com']);
+        $headers->addMailboxListHeader('To', ['from@symfony.com']);
+
+        $e = SmtpEnvelope::create(new WrappedMessage($message = new Message($headers), $message->toIterable()));
+        $this->assertEquals('from@symfony.com', $e->getSender()->getAddress());
+    }
+
     public function testSenderFromHeadersWithoutData()
     {
         $this->expectException(\LogicException::class);
