Create mailBody with only attachments part present

srsbiz · srsbiz · commit 0047cc1bcea2 · 2019-07-30T16:40:17.000+02:00
Fixes symfony#32811
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -423,12 +423,12 @@ public function getBody(): AbstractPart
      */
     private function generateBody(): AbstractPart
     {
-        if (null === $this->text && null === $this->html) {
-            throw new LogicException('A message must have a text and/or an HTML part.');
+        [$htmlPart, $attachmentParts, $inlineParts] = $this->prepareParts();
+        if (null === $this->text && null === $this->html && empty($attachmentParts)) {
+            throw new LogicException('A message must have a text and/or an HTML part or attachments.');
         }
 
         $part = null === $this->text ? null : new TextPart($this->text, $this->textCharset);
-        [$htmlPart, $attachmentParts, $inlineParts] = $this->prepareParts();
         if (null !== $htmlPart) {
             if (null !== $part) {
                 $part = new AlternativePart($part, $htmlPart);
@@ -442,7 +442,11 @@ private function generateBody(): AbstractPart
         }
 
         if ($attachmentParts) {
-            $part = new MixedPart($part, ...$attachmentParts);
+            if ($part) {
+                $part = new MixedPart($part, ...$attachmentParts);
+            } else {
+                $part = new MixedPart(...$attachmentParts);
+            }
         }
 
         return $part;
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -238,6 +238,12 @@ public function testGenerateBodyThrowsWhenEmptyBody()
         (new Email())->getBody();
     }
 
+    public function testGenerateBodyDoesNotThrowWhenAttachmentsPresent()
+    {
+        $body = (new Email())->attachFromPath(__FILE__)->getBody();
+        $this->assertNotEmpty($body);
+    }
+
     public function testGetBody()
     {
         $e = new Email();

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,12 @@ public function testGenerateBodyThrowsWhenEmptyBody()`
`238`	`238`	`(new Email())->getBody();`
`239`	`239`	`}`
`240`	`240`
	`241`	`+ public function testGenerateBodyDoesNotThrowWhenAttachmentsPresent()`
	`242`	`+ {`
	`243`	`+ $body = (new Email())->attachFromPath(__FILE__)->getBody();`
	`244`	`+ $this->assertNotEmpty($body);`
	`245`	`+ }`
	`246`	`+`
`241`	`247`	`public function testGetBody()`
`242`	`248`	`{`
`243`	`249`	`$e = new Email();`