bug #34029 [Mailer][MailchimpBridge] Fix NamedAddress obsolete paths (ogizanagi)
This PR was merged into the 4.4 branch.
Discussion
----------
[Mailer][MailchimpBridge] Fix NamedAddress obsolete paths
| Q | A
| ------------- | ---
| Branch? | 4.4 <!-- see below -->
| Bug fix? | yes
| New feature? | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets | N/A <!-- prefix each issue number with "Fix #", if any -->
| License | MIT
| Doc PR | N/A
As NamedAddress was removed in #33270 (4.4) and this bridge does require `symfony/mailer >= 4.4`.
Commits
-------
f14d082fad
[Mailer][MailchimpBridge] Fix NamedAddress obsolete paths
This commit is contained in:
commit
d6b567d8ad
@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user