[Mime] Fix attached inline part not related

keksa · keksa · commit 9fcbc3d8db48 · 2021-09-30T13:46:21.000+02:00
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -480,6 +480,12 @@ private function prepareParts(): ?array
         foreach ($this->attachments as $attachment) {
             foreach ($names as $name) {
                 if (isset($attachment['part'])) {
+                    if ($attachment['part']->getPreparedHeaders()->getHeaderBody('Content-Disposition') === 'inline') {
+                        $inlineParts[] = $attachment['part'];
+
+                        continue 2;
+                    }
+
                     continue;
                 }
                 if ($name !== $attachment['name']) {
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -344,6 +344,12 @@ public function testGenerateBody()
         // 2 parts only, not 3 (text + embedded image once)
         $this->assertCount(2, $parts = $body->getParts());
         $this->assertStringMatchesFormat('html content <img src=3D"cid:%s@symfony">', $parts[0]->bodyToString());
+
+        $e = (new Email())->from('me@example.com')->to('you@example.com');
+        $e->html('html content <img src="cid:test.gif">');
+        $e->attachPart((new DataPart($image, 'test.gif'))->asInline());
+        $body = $e->getBody();
+        $this->assertInstanceOf(RelatedPart::class, $body);
     }
 
     public function testAttachments()
