diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
index 3fbebc461f1eb..1bcdc8a1cd3be 100644
--- 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 && !$attachmentParts) {
+ throw new LogicException('A message must have a text 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
index 1d45cab9f49ff..d8a982add7256 100644
--- a/src/Symfony/Component/Mime/Tests/EmailTest.php
+++ b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -284,6 +284,10 @@ public function testGenerateBody()
$e->html('html content');
$this->assertEquals(new MixedPart($html, $att), $e->getBody());
+ $e = new Email();
+ $e->attach($file);
+ $this->assertEquals(new MixedPart($att), $e->getBody());
+
$e = new Email();
$e->html('html content');
$e->text('text content');
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy