[Mailer] Fix attachments and embedded images for Mailchimp API

michaelperrin · michaelperrin · commit d8f544d493a1 · 2019-10-16T08:30:03.000-05:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php b/src/Symfony/Component/Mailer/Bridge/Mailchimp/Http/Api/MandrillTransport.php
@@ -70,14 +70,15 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
             $disposition = $headers->getHeaderBody('Content-Disposition');
 
             $att = [
+                'name' => $attachment->getName(),
                 'content' => $attachment->bodyToString(),
                 'type' => $headers->get('Content-Type')->getBody(),
             ];
 
             if ('inline' === $disposition) {
-                $payload['images'][] = $att;
+                $payload['message']['images'][] = $att;
             } else {
-                $payload['attachments'][] = $att;
+                $payload['message']['attachments'][] = $att;
             }
         }
 
diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -69,6 +69,11 @@ public function getMediaSubtype(): string
         return $this->subtype;
     }
 
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
     /**
      * @param string $disposition one of attachment, inline, or form-data
      *

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,11 @@ public function getMediaSubtype(): string`
`69`	`69`	`return $this->subtype;`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ public function getName(): string`
	`73`	`+ {`
	`74`	`+ return $this->name;`
	`75`	`+ }`
	`76`	`+`
`72`	`77`	`/**`
`73`	`78`	`* @param string $disposition one of attachment, inline, or form-data`
`74`	`79`	`*`