MailMessage: add setDate method, add fluent API

Author: glensc

src/Mail/MailMessage.php

@@ -13,6 +13,7 @@
 
 namespace Eventum\Mail;
 
+use Date_Helper;
 use DateTime;
 use DomainException;
 use Eventum\Mail\Helper\DecodePart;
@@ -26,6 +27,7 @@
 use Zend\Mail\Header\AbstractAddressList;
 use Zend\Mail\Header\Cc;
 use Zend\Mail\Header\ContentType;
+use Zend\Mail\Header\Date;
 use Zend\Mail\Header\From;
 use Zend\Mail\Header\GenericHeader;
 use Zend\Mail\Header\HeaderInterface;
@@ -512,33 +514,63 @@ protected function getSubject()
     }
 
     /**
-     * Set the message subject header value, return Subject object
+     * Set the message subject header value
      *
-     * @return Subject
+     * @param string $subject
+     * @return $this
      */
     public function setSubject($subject)
     {
-        return $this->getSubject()->setSubject($subject);
+        $this->getSubject()->setSubject($subject);
+
+        return $this;
     }
 
     /**
      * Set To: header
      *
      * @param string|AddressList $value
+     * @return $this
      */
     public function setTo($value)
     {
         $this->setAddressListHeader('To', $value);
+
+        return $this;
     }
 
     /**
      * Set From: header
      *
-     * @param string $value
+     * @param string|AddressList $value
+     * @return $this
      */
     public function setFrom($value)
     {
         $this->setAddressListHeader('From', $value);
+
+        return $this;
+    }
+
+    /**
+     * Set Date: header
+     *
+     * @param string $value
+     * @return $this
+     */
+    public function setDate($value = null)
+    {
+        $value = $value ?: Date_Helper::getRFC822Date(time());
+
+        // can not update 'Date' header, so remove it
+        if ($this->headers->has('Date')) {
+            $this->headers->removeHeader('Date');
+        }
+
+        $header = new Date($value);
+        $this->headers->addHeader($header);
+
+        return $this;
     }
 
     /**
@@ -697,6 +729,9 @@ public function stripHeaders()
      *
      * IMPORTANT: it should not contain any multipart changes,
      * as then everything will blow up as it is not parsed again.
+     *
+     * @param string|Mime\Message $content
+     * @return $this
      */
     public function setContent($content)
     {
@@ -734,10 +769,12 @@ public function setContent($content)
             }
             $this->content = $message->getBodyText();
 
-            return;
+            return $this;
         }
 
         $this->content = $content;
+
+        return $this;
     }
 
     /**

tests/Mail/MailMessageTest.php

@@ -756,7 +756,9 @@ public function testParseHeaders()
         $value = '[#77675] New Issue:xxxxxxxxx xxxxxxx xxxxxxxx xxxxxxxxxxxxx xxxxxxxxxx xxxxxxxx, tähtaeg xx.xx, xxxx';
         try {
             // it fails with line length exactly 76, but suceeds with anything else, like 75 or 77
-            $v = iconv_mime_encode('x-test', $value, ['scheme' => 'Q', 'line-length' => '76', 'line-break-chars' => ' ']);
+            $v = iconv_mime_encode(
+                'x-test', $value, ['scheme' => 'Q', 'line-length' => '76', 'line-break-chars' => ' ']
+            );
         } catch (PHPUnit_Framework_Error_Notice $e) {
             error_log($e->getMessage());
         }