From f14d082fadac2761f913251b222dabdd75265257 Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Fri, 18 Oct 2019 16:50:31 +0200 Subject: [PATCH] [Mailer][MailchimpBridge] Fix NamedAddress obsolete paths --- .../Mailchimp/Transport/MandrillApiTransport.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php index 57f024e5f6..067d57bd67 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php @@ -17,7 +17,6 @@ use Symfony\Component\Mailer\Exception\HttpTransportException; 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; @@ -76,15 +75,12 @@ class MandrillApiTransport extends AbstractApiTransport 'html' => $email->getHtmlBody(), 'text' => $email->getTextBody(), 'subject' => $email->getSubject(), + 'from_name' => $envelope->getSender()->getName(), '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'); @@ -126,13 +122,10 @@ class MandrillApiTransport extends AbstractApiTransport $recipientPayload = [ 'email' => $recipient->getAddress(), + 'name' => $recipient->getName(), 'type' => $type, ]; - if ($recipient instanceof NamedAddress) { - $recipientPayload['name'] = $recipient->getName(); - } - $recipients[] = $recipientPayload; }