MAGETWO-67680: Replace Zend_Mail (ZF1) with Zend\Mail (ZF2) #8608

 - removed methods getBodyHtml() and getBodyText(). Use method getBody()

Author: Oleksii Korshenko

app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php

@@ -6,6 +6,7 @@
 namespace Magento\Newsletter\Model\Queue;
 
 use Magento\Email\Model\AbstractTemplate;
+use Magento\Framework\Exception\LocalizedException;
 
 class TransportBuilder extends \Magento\Framework\Mail\Template\TransportBuilder
 {
@@ -48,13 +49,24 @@ protected function prepareMessage()
         $template = $this->getTemplate()->setData($this->templateData);
         $this->setTemplateFilter($template);
 
-        $this->message->setMessageType(
-            \Magento\Framework\Mail\MessageInterface::TYPE_HTML
-        )->setBody(
-            $template->getProcessedTemplate($this->templateVars)
-        )->setSubject(
-            $template->getSubject()
-        );
+        $body = $template->getProcessedTemplate($this->templateVars);
+        switch ($template->getType()) {
+            case \Magento\Framework\Mail\MessageInterface::TYPE_TEXT:
+                $this->message->setBodyText($body);
+                break;
+
+            case \Magento\Framework\Mail\MessageInterface::TYPE_HTML:
+                $this->message->setBodyHtml($body);
+                break;
+
+            default;
+                throw new LocalizedException(
+                    __('Unknown template type')
+                );
+                break;
+        }
+
+        $this->message->setSubject($template->getSubject());
 
         return $this;
     }

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

@@ -24,16 +24,6 @@ public function setBodyHtml($html);
      */
     public function setBodyText($text);
 
-    /**
-     * @return string
-     */
-    public function getBodyText();
-
-    /**
-     * @return string
-     */
-    public function getBodyHtml();
-
     /**
      * Get message source code
      *

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

@@ -7,7 +7,6 @@
  */
 namespace Magento\Framework\Mail;
 
-use Magento\Framework\Exception\LocalizedException;
 use Zend\Mime\Mime;
 use Zend\Mime\Part;
 
@@ -43,8 +42,6 @@ public function __construct($charset = 'utf-8')
      * {@inheritdoc}
      *
      * @deprecated
-     * @see \Magento\Framework\Mail\Message::getBodyText
-     * @see \Magento\Framework\Mail\Message::getBodyHtml
      * @see \Magento\Framework\Mail\Message::setBodyText
      * @see \Magento\Framework\Mail\Message::setBodyHtml
      */
@@ -90,10 +87,6 @@ public function getSubject()
 
     /**
      * {@inheritdoc}
-     *
-     * @deprecated
-     * @see \Magento\Framework\Mail\Message::getBodyText
-     * @see \Magento\Framework\Mail\Message::getBodyHtml
      */
     public function getBody()
     {
@@ -189,30 +182,4 @@ public function setBodyText($text)
         $this->setMessageType(self::TYPE_TEXT);
         return $this->setBody($text);
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBodyText()
-    {
-        if ($this->messageType != self::TYPE_TEXT) {
-            throw new LocalizedException(
-                __('Text message body is not set')
-            );
-        }
-        return $this->getBody();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBodyHtml()
-    {
-        if ($this->messageType != self::TYPE_HTML) {
-            throw new LocalizedException(
-                __('HTML message body is not set')
-            );
-        }
-        return $this->getBody();
-    }
 }

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

@@ -16,9 +16,13 @@ interface MessageInterface
 {
     /**
      * Types of message
+     * @deprecated
      */
     const TYPE_TEXT = 'text/plain';
 
+    /**
+     * @deprecated
+     */
     const TYPE_HTML = 'text/html';
 
     /**
@@ -51,11 +55,7 @@ public function setBody($body);
     /**
      * Get message body
      *
-     * @return mixed
-     *
-     * @deprecated
-     * @see \Magento\Framework\Mail\MailMessageInterface::getBodyHtml
-     * @see \Magento\Framework\Mail\MailMessageInterface::getBodyText()
+     * @return string
      */
     public function getBody();