bug #59598 [Mime] Fix body validity check in Email when using Message::setBody() (alexandre-daubois)

fabpot · fabpot · commit c09342e7b807 · 2025-01-25T10:39:52.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Mime] Fix body validity check in `Email` when using `Message::setBody()` | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #59582 | License | MIT Commits ------- b983d1b [Mime] Fix body validity check in `Email` when using `Message::setBody()`
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -416,7 +416,7 @@ public function ensureValidity()
 
     private function ensureBodyValid(): void
     {
-        if (null === $this->text && null === $this->html && !$this->attachments) {
+        if (null === $this->text && null === $this->html && !$this->attachments && null === parent::getBody()) {
             throw new LogicException('A message must have a text or an HTML part or attachments.');
         }
     }
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -695,4 +695,60 @@ public function testEmailsWithAttachmentsWhichAreAFileInstanceCanBeUnserialized(
         $this->assertCount(1, $attachments);
         $this->assertStringContainsString('foo_bar_xyz_123', $attachments[0]->getBody());
     }
+
+    public function testInvalidBodyWithEmptyEmail()
+    {
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('A message must have a text or an HTML part or attachments.');
+
+        (new Email())->ensureValidity();
+    }
+
+    public function testBodyWithTextIsValid()
+    {
+        $email = new Email();
+        $email->to('test@example.com')
+            ->from('test@example.com')
+            ->text('foo');
+
+        $email->ensureValidity();
+
+        $this->expectNotToPerformAssertions();
+    }
+
+    public function testBodyWithHtmlIsValid()
+    {
+        $email = new Email();
+        $email->to('test@example.com')
+            ->from('test@example.com')
+            ->html('foo');
+
+        $email->ensureValidity();
+
+        $this->expectNotToPerformAssertions();
+    }
+
+    public function testEmptyBodyWithAttachmentsIsValid()
+    {
+        $email = new Email();
+        $email->to('test@example.com')
+            ->from('test@example.com')
+            ->addPart(new DataPart('foo'));
+
+        $email->ensureValidity();
+
+        $this->expectNotToPerformAssertions();
+    }
+
+    public function testSetBodyIsValid()
+    {
+        $email = new Email();
+        $email->to('test@example.com')
+            ->from('test@example.com')
+            ->setBody(new TextPart('foo'));
+
+        $email->ensureValidity();
+
+        $this->expectNotToPerformAssertions();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ public function ensureValidity()`
`416`	`416`
`417`	`417`	`private function ensureBodyValid(): void`
`418`	`418`	`{`
`419`		`- if (null === $this->text && null === $this->html && !$this->attachments) {`
	`419`	`+ if (null === $this->text && null === $this->html && !$this->attachments && null === parent::getBody()) {`
`420`	`420`	`throw new LogicException('A message must have a text or an HTML part or attachments.');`
`421`	`421`	`}`
`422`	`422`	`}`