PR review

0x346e3730 · 0x346e3730 · commit 0db9cf2a98e0 · 2024-01-19T09:14:52.000+04:00
diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php
@@ -140,8 +140,8 @@ public function generateMessageId(): string
         if ($this->headers->has('Sender')) {
             $sender = $this->headers->get('Sender')->getAddress();
         } elseif ($this->headers->has('From')) {
-            if (empty($froms = $this->headers->get('From')->getAddresses())) {
-                throw new LogicException('Your email has a From header that contains no addresses. Did you forgot to add emails in the "from" method ?');
+            if (!$froms = $this->headers->get('From')->getAddresses()) {
+                throw new LogicException('A "From" header must have at least one email address.');
             }
             $sender = $froms[0];
         } else {
diff --git a/src/Symfony/Component/Mime/Tests/MessageTest.php b/src/Symfony/Component/Mime/Tests/MessageTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Exception\LogicException;
 use Symfony\Component\Mime\Header\Headers;
 use Symfony\Component\Mime\Header\MailboxListHeader;
 use Symfony\Component\Mime\Header\UnstructuredHeader;
@@ -127,9 +128,9 @@ public function testGetPreparedHeadersHasSenderWhenNeeded()
 
     public function testGenerateMessageIdThrowsWhenHasFromButNoAddresses()
     {
-        $this->expectException(\LogicException::class);
         $message = new Message();
         $message->getHeaders()->addMailboxListHeader('From', []);
+        $this->expectException(LogicException::class);
         $message->generateMessageId();
     }
 
