Replace empty() check, test correct body

srsbiz · srsbiz · commit 0752ee5be232 · 2019-08-04T13:31:03.000+02:00
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -424,7 +424,7 @@ public function getBody(): AbstractPart
     private function generateBody(): AbstractPart
     {
         [$htmlPart, $attachmentParts, $inlineParts] = $this->prepareParts();
-        if (null === $this->text && null === $this->html && empty($attachmentParts)) {
+        if (null === $this->text && null === $this->html && !$attachmentParts) {
             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
@@ -238,12 +238,6 @@ public function testGenerateBodyThrowsWhenEmptyBody()
         (new Email())->getBody();
     }
 
-    public function testGenerateBodyDoesNotThrowWhenAttachmentsPresent()
-    {
-        $body = (new Email())->attachFromPath(__FILE__)->getBody();
-        $this->assertNotEmpty($body);
-    }
-
     public function testGetBody()
     {
         $e = new Email();
@@ -290,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');

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ public function getBody(): AbstractPart`
`424`	`424`	`private function generateBody(): AbstractPart`
`425`	`425`	`{`
`426`	`426`	`[$htmlPart, $attachmentParts, $inlineParts] = $this->prepareParts();`
`427`		`- if (null === $this->text && null === $this->html && empty($attachmentParts)) {`
	`427`	`+ if (null === $this->text && null === $this->html && !$attachmentParts) {`
`428`	`428`	`throw new LogicException('A message must have a text or an HTML part or attachments.');`
`429`	`429`	`}`
`430`	`430`