Merge branch '4.3' into 4.4

* 4.3:
  [Dotenv] allow LF in single-quoted strings
  [Yaml] Throw exception for tagged invalid inline elements
  [Mailer] Fix Mandrill Transport API payload with named addresses

Author: nicolas-grekas

Mailchimp/Transport/MandrillApiTransport.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\AbstractApiTransport;
 use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\NamedAddress;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -75,11 +76,15 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'html' => $email->getHtmlBody(),
                 'text' => $email->getTextBody(),
                 'subject' => $email->getSubject(),
-                'from_email' => $envelope->getSender()->toString(),
+                'from_email' => $envelope->getSender()->getAddress(),
                 'to' => $this->getRecipients($email, $envelope),
             ],
         ];
 
+        if ($envelope->getSender() instanceof NamedAddress) {
+            $payload['message']['from_name'] = $envelope->getSender()->getName();
+        }
+
         foreach ($email->getAttachments() as $attachment) {
             $headers = $attachment->getPreparedHeaders();
             $disposition = $headers->getHeaderBody('Content-Disposition');
@@ -119,10 +124,16 @@ protected function getRecipients(Email $email, Envelope $envelope): array
                 $type = 'cc';
             }
 
-            $recipients[] = [
-                'email' => $recipient->toString(),
+            $recipientPayload = [
+                'email' => $recipient->getAddress(),
                 'type' => $type,
             ];
+
+            if ($recipient instanceof NamedAddress) {
+                $recipientPayload['name'] = $recipient->getName();
+            }
+
+            $recipients[] = $recipientPayload;
         }
 
         return $recipients;

MandrillApiTransport.php

@@ -17,6 +17,7 @@
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\Transport\AbstractApiTransport;
 use Symfony\Component\Mime\Email;
+use Symfony\Component\Mime\NamedAddress;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -75,11 +76,15 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'html' => $email->getHtmlBody(),
                 'text' => $email->getTextBody(),
                 'subject' => $email->getSubject(),
-                'from_email' => $envelope->getSender()->toString(),
+                'from_email' => $envelope->getSender()->getAddress(),
                 'to' => $this->getRecipients($email, $envelope),
             ],
         ];
 
+        if ($envelope->getSender() instanceof NamedAddress) {
+            $payload['message']['from_name'] = $envelope->getSender()->getName();
+        }
+
         foreach ($email->getAttachments() as $attachment) {
             $headers = $attachment->getPreparedHeaders();
             $disposition = $headers->getHeaderBody('Content-Disposition');
@@ -119,10 +124,16 @@ protected function getRecipients(Email $email, Envelope $envelope): array
                 $type = 'cc';
             }
 
-            $recipients[] = [
-                'email' => $recipient->toString(),
+            $recipientPayload = [
+                'email' => $recipient->getAddress(),
                 'type' => $type,
             ];
+
+            if ($recipient instanceof NamedAddress) {
+                $recipientPayload['name'] = $recipient->getName();
+            }
+
+            $recipients[] = $recipientPayload;
         }
 
         return $recipients;