Merge branch 'feature/#160-allow-messages-without-a-to-header' into d…

…evelop Close #160
zendframework · Mar 1, 2018 · 8ca640a · 8ca640a
2 parents d3010b2 + f403b56
commit 8ca640a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/src/Transport/Sendmail.php b/src/Transport/Sendmail.php
@@ -148,8 +148,15 @@ protected function prepareRecipients(Mail\Message $message)
     {
         $headers = $message->getHeaders();
 
-        if (! $headers->has('to')) {
-            throw new Exception\RuntimeException('Invalid email; contains no "To" header');
+        $hasTo = $headers->has('to');
+        if (! $hasTo && ! $headers->has('cc') && ! $headers->has('bcc')) {
+            throw new Exception\RuntimeException(
+                'Invalid email; contains no at least one of "To", "Cc", and "Bcc" header'
+            );
+        }
+
+        if (! $hasTo) {
+            return '';
         }
 
         /** @var Mail\Header\To $to */

diff --git a/test/Transport/SendmailTest.php b/test/Transport/SendmailTest.php
@@ -223,4 +223,37 @@ public function testTrimmedParameters()
 
         $this->assertSame('-R hdrs', $r->getValue($this->transport));
     }
+
+    public function testAllowMessageWithEmptyToHeaderButHasCcHeader()
+    {
+        $message = new Message();
+        $message->addCc('matthew@zend.com')
+                ->setSender('ralph.schindler@zend.com', 'Ralph Schindler')
+                ->setSubject('Testing Zend\Mail\Transport\Sendmail')
+                ->setBody('This is only a test.');
+
+        $this->transport->send($message);
+    }
+
+    public function testAllowMessageWithEmptyToHeaderButHasBccHeader()
+    {
+        $message = new Message();
+        $message->addBcc('zf-crteam@lists.zend.com', 'CR-Team, ZF Project')
+                ->setSender('ralph.schindler@zend.com', 'Ralph Schindler')
+                ->setSubject('Testing Zend\Mail\Transport\Sendmail')
+                ->setBody('This is only a test.');
+
+        $this->transport->send($message);
+    }
+
+    public function testDoNotAllowMessageWithoutToAndCcAndBccHeaders()
+    {
+        $message = new Message();
+        $message->setSender('ralph.schindler@zend.com', 'Ralph Schindler')
+                ->setSubject('Testing Zend\Mail\Transport\Sendmail')
+                ->setBody('This is only a test.');
+
+        $this->expectException(RuntimeException::class);
+        $this->transport->send($message);
+    }
 }