[Mailer] Fix Message ID for Postmark SMTP

Author: fabpot

Mailgun/Transport/MailgunApiTransport.php

@@ -68,7 +68,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
                 throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $response->getStatusCode()), $response);
             }
 
-            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result, $response->getStatusCode()), $response);
+            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()), $response);
         }
 
         $sentMessage->setMessageId($result['id']);

Mailgun/Transport/MailgunHttpTransport.php

@@ -70,7 +70,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
                 throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $response->getStatusCode()), $response);
             }
 
-            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result, $response->getStatusCode()), $response);
+            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()), $response);
         }
 
         $message->setMessageId($result['id']);

MailgunApiTransport.php

@@ -68,7 +68,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
                 throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $response->getStatusCode()), $response);
             }
 
-            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result, $response->getStatusCode()), $response);
+            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()), $response);
         }
 
         $sentMessage->setMessageId($result['id']);

MailgunHttpTransport.php

@@ -70,7 +70,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
                 throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result['message'], $response->getStatusCode()), $response);
             }
 
-            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $result, $response->getStatusCode()), $response);
+            throw new HttpTransportException(sprintf('Unable to send an email: %s (code %s).', $response->getContent(false), $response->getStatusCode()), $response);
         }
 
         $message->setMessageId($result['id']);

Postmark/Transport/PostmarkSmtpTransport.php

@@ -12,7 +12,11 @@
 namespace Symfony\Component\Mailer\Bridge\Postmark\Transport;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
+use Symfony\Component\Mime\Message;
+use Symfony\Component\Mime\RawMessage;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -27,4 +31,13 @@ public function __construct(string $id, EventDispatcherInterface $dispatcher = n
         $this->setUsername($id);
         $this->setPassword($id);
     }
+
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
+    {
+        if ($message instanceof Message) {
+            $message->getHeaders()->addTextHeader('X-PM-KeepID', 'true');
+        }
+
+        return parent::send($message, $envelope);
+    }
 }

PostmarkSmtpTransport.php

@@ -12,7 +12,11 @@
 namespace Symfony\Component\Mailer\Bridge\Postmark\Transport;
 
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Mailer\Envelope;
+use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
+use Symfony\Component\Mime\Message;
+use Symfony\Component\Mime\RawMessage;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -27,4 +31,13 @@ public function __construct(string $id, EventDispatcherInterface $dispatcher = n
         $this->setUsername($id);
         $this->setPassword($id);
     }
+
+    public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
+    {
+        if ($message instanceof Message) {
+            $message->getHeaders()->addTextHeader('X-PM-KeepID', 'true');
+        }
+
+        return parent::send($message, $envelope);
+    }
 }