Remove zend mail inheritance

Author: schmengler

dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Newsletter\Model;
 
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+
 class SubscriberTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -27,13 +29,14 @@ protected function setUp()
     public function testEmailConfirmation()
     {
         $this->_model->subscribe('customer_confirm@example.com');
+        /** @var TransportBuilderMock $transportBuilder */
         $transportBuilder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\TestFramework\Mail\Template\TransportBuilderMock::class);
         // confirmationCode 'ysayquyajua23iq29gxwu2eax2qb6gvy' is taken from fixture
         $this->assertContains(
             '/newsletter/subscriber/confirm/id/' . $this->_model->getSubscriberId()
             . '/code/ysayquyajua23iq29gxwu2eax2qb6gvy',
-            $transportBuilder->getSentMessage()->getBodyHtml()->getRawContent()
+            $transportBuilder->getSentMessage()->getRawMessage()
         );
         $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->_model->getSubscriberStatus());
     }

dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php

@@ -82,7 +82,7 @@ public function testSend($isCustomerIdUsed)
         );
         $this->assertContains(
             'John Smith,',
-            $transportBuilder->getSentMessage()->getBodyHtml()->getRawContent()
+            $transportBuilder->getSentMessage()->getRawMessage()
         );
     }
 

dev/tests/integration/testsuite/Magento/ProductAlert/Model/ObserverTest.php

@@ -56,7 +56,7 @@ public function testProcess()
         );
         $this->assertContains(
             'John Smith,',
-            $transportBuilder->getSentMessage()->getBodyHtml()->getRawContent()
+            $transportBuilder->getSentMessage()->getRawMessage()
         );
     }
 }

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

@@ -11,21 +11,25 @@
 use Zend\Mime\Part;
 
 /**
- * @todo composition instead of inheritance for better testability
- * - add a ZendMailDecorator interface with getZendMail() method for usage in \Magento\Framework\Mail\Transport
  * @todo get rid of temporal coupling (setMessageType() + setBody())
- * - deprecate setMessageType(), implement a HtmlMessage decorator instead
+ * - deprecate setMessageType(), setBody() and getBody()
+ * - implement setBodyHtml(), setBodyText(), getBodyHtml() and getBodyText()
  * - change usage in \Magento\Framework\Mail\Template\TransportBuilder::prepareMessage()
  */
-class Message extends \Zend\Mail\Message implements MessageInterface
+class Message implements MessageInterface
 {
+    /**
+     * @var \Zend\Mail\Message
+     */
+    private $zendMessage;
 
     /**
-     * @param string $charset
+     * @param string $encoding
      */
-    public function __construct($charset = 'utf-8')
+    public function __construct($encoding = 'utf-8')
     {
-        $this->encoding = $charset;
+        $this->zendMessage = new \Zend\Mail\Message;
+        $this->zendMessage->setEncoding($encoding);
     }
 
     /**
@@ -49,24 +53,76 @@ public function setMessageType($type)
 
     /**
      * @param null|object|string|\Zend\Mime\Message $body
-     * @return \Zend\Mail\Message
+     * @return $this
      */
     public function setBody($body)
     {
         if (is_string($body) && $this->messageType === MessageInterface::TYPE_HTML) {
-            $body = self::htmlMimeFromString($body);
+            $body = self::createHtmlMimeFromString($body);
         }
-        return parent::setBody($body);
+        $this->zendMessage->setBody($body);
+        return $this;
+    }
+
+    public function setSubject($subject)
+    {
+        $this->zendMessage->setSubject($subject);
+        return $this;
+    }
+
+    public function getSubject()
+    {
+        return $this->zendMessage->getSubject();
+    }
+
+    public function getBody()
+    {
+        return $this->zendMessage->getBody();
+    }
+
+    public function setFrom($fromAddress)
+    {
+        $this->zendMessage->setFrom($fromAddress);
+        return $this;
+    }
+
+    public function addTo($toAddress)
+    {
+        $this->zendMessage->addTo($toAddress);
+        return $this;
+    }
+
+    public function addCc($ccAddress)
+    {
+        $this->zendMessage->addCc($ccAddress);
+        return $this;
+    }
+
+    public function addBcc($bccAddress)
+    {
+        $this->zendMessage->addBcc($bccAddress);
+        return $this;
+    }
+
+    public function setReplyTo($replyToAddress)
+    {
+        $this->zendMessage->setReplyTo($replyToAddress);
+        return $this;
+    }
+
+    public function getRawMessage()
+    {
+        return $this->zendMessage->toString();
     }
 
     /**
      * @param string $htmlBody
      * @return \Zend\Mime\Message
      */
-    private function htmlMimeFromString($htmlBody)
+    private function createHtmlMimeFromString($htmlBody)
     {
         $htmlPart = new Part($htmlBody);
-        $htmlPart->setCharset($this->getEncoding());
+        $htmlPart->setCharset($this->zendMessage->getEncoding());
         $htmlPart->setType(Mime::TYPE_HTML);
         $mimeMessage = new \Zend\Mime\Message();
         $mimeMessage->addPart($htmlPart);

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

@@ -96,4 +96,11 @@ public function setReplyTo($replyToAddress);
      * @return $this
      */
     public function setMessageType($type);
+
+    /**
+     * Get message source code
+     *
+     * @return string
+     */
+    public function getRawMessage();
 }

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

@@ -6,9 +6,15 @@
  */
 namespace Magento\Framework\Mail;
 
+use Zend\Mail\Message;
+use Zend\Mail\Transport\Sendmail;
 
-class Transport extends \Zend\Mail\Transport\Sendmail implements \Magento\Framework\Mail\TransportInterface
+class Transport implements \Magento\Framework\Mail\TransportInterface
 {
+    /**
+     * @var Sendmail
+     */
+    private $zendTransport;
     /**
      * @var \Magento\Framework\Mail\MessageInterface
      */
@@ -21,10 +27,7 @@ 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\Message) {
-            throw new \InvalidArgumentException('The message should be an instance of \Zend\Mail\Message');
-        }
-        parent::__construct($parameters);
+        $this->zendTransport = new Sendmail($parameters);
         $this->_message = $message;
     }
 
@@ -37,7 +40,9 @@ public function __construct(\Magento\Framework\Mail\MessageInterface $message, $
     public function sendMessage()
     {
         try {
-            parent::send($this->_message);
+            $this->zendTransport->send(
+                Message::fromString($this->_message->getRawMessage())
+            );
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);
         }