Replace ZF1 Zend_Mail with ZF2 Zend\Mail

Author: schmengler

lib/internal/Magento/Framework/Mail/Message.php

@@ -7,14 +7,17 @@
  */
 namespace Magento\Framework\Mail;
 
-class Message extends \Zend_Mail implements MessageInterface
+use Zend\Mime\Mime;
+use Zend\Mime\Part;
+
+class Message extends \Zend\Mail\Message implements MessageInterface
 {
     /**
      * @param string $charset
      */
     public function __construct($charset = 'utf-8')
     {
-        parent::__construct($charset);
+        parent::setEncoding($charset);
     }
 
     /**
@@ -24,25 +27,14 @@ public function __construct($charset = 'utf-8')
      */
     protected $messageType = self::TYPE_TEXT;
 
-    /**
-     * Set message body
-     *
-     * @param string $body
-     * @return $this
-     */
-    public function setBody($body)
+    private function htmlMimeFromString($htmlBody)
     {
-        return $this->messageType == self::TYPE_TEXT ? $this->setBodyText($body) : $this->setBodyHtml($body);
-    }
-
-    /**
-     * Set message body
-     *
-     * @return string
-     */
-    public function getBody()
-    {
-        return $this->messageType == self::TYPE_TEXT ? $this->getBodyText() : $this->getBodyHtml();
+        $htmlPart = new Part($htmlBody);
+        $htmlPart->setCharset($this->getEncoding());
+        $htmlPart->setType(Mime::TYPE_HTML);
+        $mimeMessage = new \Zend\Mime\Message();
+        $mimeMessage->addPart($htmlPart);
+        return $mimeMessage;
     }
 
     /**
@@ -56,4 +48,17 @@ public function setMessageType($type)
         $this->messageType = $type;
         return $this;
     }
+
+    /**
+     * @param null|object|string|\Zend\Mime\Message $body
+     * @return \Zend\Mail\Message
+     */
+    public function setBody($body)
+    {
+        if (is_string($body) && $this->messageType === MessageInterface::TYPE_HTML) {
+            $body = self::htmlMimeFromString($body);
+        }
+        return parent::setBody($body);
+    }
+
 }

lib/internal/Magento/Framework/Mail/Test/Unit/TransportTest.php

@@ -25,7 +25,7 @@ protected function setUp()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The message should be an instance of \Zend_Mail
+     * @expectedExceptionMessage The message should be an instance of \Zend\Mail\Message
      */
     public function testTransportWithIncorrectMessageObject()
     {

lib/internal/Magento/Framework/Mail/Transport.php

@@ -6,7 +6,8 @@
  */
 namespace Magento\Framework\Mail;
 
-class Transport extends \Zend_Mail_Transport_Sendmail implements \Magento\Framework\Mail\TransportInterface
+
+class Transport extends \Zend\Mail\Transport\Sendmail implements \Magento\Framework\Mail\TransportInterface
 {
     /**
      * @var \Magento\Framework\Mail\MessageInterface
@@ -20,8 +21,8 @@ class Transport extends \Zend_Mail_Transport_Sendmail implements \Magento\Framew
      */
     public function __construct(\Magento\Framework\Mail\MessageInterface $message, $parameters = null)
     {
-        if (!$message instanceof \Zend_Mail) {
-            throw new \InvalidArgumentException('The message should be an instance of \Zend_Mail');
+        if (!$message instanceof \Zend\Mail\Message) {
+            throw new \InvalidArgumentException('The message should be an instance of \Zend\Mail\Message');
         }
         parent::__construct($parameters);
         $this->_message = $message;