exception wording + adds tests

0x346e3730 · 0x346e3730 · commit a5f39b16304c · 2024-01-17T21:00:30.000+04:00
diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php
@@ -141,7 +141,7 @@ public function generateMessageId(): string
             $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 but no addresses. Did you forgot to add emails in the "from" method ?');
+                throw new LogicException('Your email has a From header that contains no addresses. Did you forgot to add emails in the "from" method ?');
             }
             $sender = $froms[0];
         } else {
diff --git a/src/Symfony/Component/Mime/Tests/MessageTest.php b/src/Symfony/Component/Mime/Tests/MessageTest.php
@@ -125,6 +125,14 @@ public function testGetPreparedHeadersHasSenderWhenNeeded()
         $this->assertEquals('thomas@symfony.com', $message->getPreparedHeaders()->get('Sender')->getAddress()->getAddress());
     }
 
+    public function testGenerateMessageIdThrowsWhenHasFromButNoAddresses()
+    {
+        $this->expectException(\LogicException::class);
+        $message = new Message();
+        $message->getHeaders()->addMailboxListHeader('From', []);
+        $message->generateMessageId();
+    }
+
     public function testToString()
     {
         $message = new Message();

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function generateMessageId(): string`
`141`	`141`	`$sender = $this->headers->get('Sender')->getAddress();`
`142`	`142`	`} elseif ($this->headers->has('From')) {`
`143`	`143`	`if (empty($froms = $this->headers->get('From')->getAddresses())) {`
`144`		`- throw new LogicException('Your email has a From header but no addresses. Did you forgot to add emails in the "from" method ?');`
	`144`	`+ throw new LogicException('Your email has a From header that contains no addresses. Did you forgot to add emails in the "from" method ?');`
`145`	`145`	`}`
`146`	`146`	`$sender = $froms[0];`
`147`	`147`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,14 @@ public function testGetPreparedHeadersHasSenderWhenNeeded()`
`125`	`125`	`$this->assertEquals('[email protected]', $message->getPreparedHeaders()->get('Sender')->getAddress()->getAddress());`
`126`	`126`	`}`
`127`	`127`
	`128`	`+ public function testGenerateMessageIdThrowsWhenHasFromButNoAddresses()`
	`129`	`+ {`
	`130`	`+ $this->expectException(\LogicException::class);`
	`131`	`+ $message = new Message();`
	`132`	`+ $message->getHeaders()->addMailboxListHeader('From', []);`
	`133`	`+ $message->generateMessageId();`
	`134`	`+ }`
	`135`	`+`
`128`	`136`	`public function testToString()`
`129`	`137`	`{`
`130`	`138`	`$message = new Message();`