[Mailer][MailchimpBridge] Fix NamedAddress obsolete paths
This commit is contained in:
parent
594e7aef87
commit
f14d082fad
@ -17,7 +17,6 @@ use Symfony\Component\Mailer\Exception\HttpTransportException;
|
|||||||
use Symfony\Component\Mailer\SentMessage;
|
use Symfony\Component\Mailer\SentMessage;
|
||||||
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
|
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
|
||||||
use Symfony\Component\Mime\Email;
|
use Symfony\Component\Mime\Email;
|
||||||
use Symfony\Component\Mime\NamedAddress;
|
|
||||||
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
|
||||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
use Symfony\Contracts\HttpClient\ResponseInterface;
|
use Symfony\Contracts\HttpClient\ResponseInterface;
|
||||||
@ -76,15 +75,12 @@ class MandrillApiTransport extends AbstractApiTransport
|
|||||||
'html' => $email->getHtmlBody(),
|
'html' => $email->getHtmlBody(),
|
||||||
'text' => $email->getTextBody(),
|
'text' => $email->getTextBody(),
|
||||||
'subject' => $email->getSubject(),
|
'subject' => $email->getSubject(),
|
||||||
|
'from_name' => $envelope->getSender()->getName(),
|
||||||
'from_email' => $envelope->getSender()->getAddress(),
|
'from_email' => $envelope->getSender()->getAddress(),
|
||||||
'to' => $this->getRecipients($email, $envelope),
|
'to' => $this->getRecipients($email, $envelope),
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($envelope->getSender() instanceof NamedAddress) {
|
|
||||||
$payload['message']['from_name'] = $envelope->getSender()->getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($email->getAttachments() as $attachment) {
|
foreach ($email->getAttachments() as $attachment) {
|
||||||
$headers = $attachment->getPreparedHeaders();
|
$headers = $attachment->getPreparedHeaders();
|
||||||
$disposition = $headers->getHeaderBody('Content-Disposition');
|
$disposition = $headers->getHeaderBody('Content-Disposition');
|
||||||
@ -126,13 +122,10 @@ class MandrillApiTransport extends AbstractApiTransport
|
|||||||
|
|
||||||
$recipientPayload = [
|
$recipientPayload = [
|
||||||
'email' => $recipient->getAddress(),
|
'email' => $recipient->getAddress(),
|
||||||
|
'name' => $recipient->getName(),
|
||||||
'type' => $type,
|
'type' => $type,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($recipient instanceof NamedAddress) {
|
|
||||||
$recipientPayload['name'] = $recipient->getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
$recipients[] = $recipientPayload;
|
$recipients[] = $recipientPayload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user