Fix integration test and code style issues

Author: schmengler

dev/tests/integration/testsuite/Magento/Wishlist/Controller/IndexTest.php

@@ -158,7 +158,7 @@ public function testSendAction()
         );
 
         $actualResult = \Zend_Mime_Decode::decodeQuotedPrintable(
-            $transportBuilder->getSentMessage()->getBodyHtml()->getContent()
+            $transportBuilder->getSentMessage()->getRawMessage()
         );
 
         $this->assertStringMatchesFormat(

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

@@ -64,52 +64,85 @@ public function setBody($body)
         return $this;
     }
 
+    /**
+     * @param string $subject
+     * @return $this
+     */
     public function setSubject($subject)
     {
         $this->zendMessage->setSubject($subject);
         return $this;
     }
 
+    /**
+     * @return null|string
+     */
     public function getSubject()
     {
         return $this->zendMessage->getSubject();
     }
 
+    /**
+     * @return object
+     */
     public function getBody()
     {
         return $this->zendMessage->getBody();
     }
 
+    /**
+     * @param array|string $fromAddress
+     * @return $this
+     */
     public function setFrom($fromAddress)
     {
         $this->zendMessage->setFrom($fromAddress);
         return $this;
     }
 
+    /**
+     * @param array|string $toAddress
+     * @return $this
+     */
     public function addTo($toAddress)
     {
         $this->zendMessage->addTo($toAddress);
         return $this;
     }
 
+    /**
+     * @param array|string $ccAddress
+     * @return $this
+     */
     public function addCc($ccAddress)
     {
         $this->zendMessage->addCc($ccAddress);
         return $this;
     }
 
+    /**
+     * @param array|string $bccAddress
+     * @return $this
+     */
     public function addBcc($bccAddress)
     {
         $this->zendMessage->addBcc($bccAddress);
         return $this;
     }
 
+    /**
+     * @param array|string $replyToAddress
+     * @return $this
+     */
     public function setReplyTo($replyToAddress)
     {
         $this->zendMessage->setReplyTo($replyToAddress);
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getRawMessage()
     {
         return $this->zendMessage->toString();

lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Mail\MessageInterface;
-use Zend\Mail\Headers;
 
 class TransportBuilderTest extends \PHPUnit_Framework_TestCase
 {
@@ -54,7 +53,6 @@ protected function setUp()
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->templateFactoryMock = $this->getMock(\Magento\Framework\Mail\Template\FactoryInterface::class);
         $this->messageMock = $this->getMock(\Magento\Framework\Mail\Message::class);
-        $this->messageMock->method('getHeaders')->willReturn(new Headers());
         $this->objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->senderResolverMock = $this->getMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
         $this->mailTransportFactoryMock = $this->getMockBuilder(

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

@@ -12,10 +12,11 @@ class Transport implements \Magento\Framework\Mail\TransportInterface
      * @var \Zend\Mail\Transport\Sendmail
      */
     private $zendTransport;
+
     /**
      * @var \Magento\Framework\Mail\MessageInterface
      */
-    protected $_message;
+    private $message;
 
     /**
      * @param MessageInterface $message
@@ -25,7 +26,7 @@ class Transport implements \Magento\Framework\Mail\TransportInterface
     public function __construct(\Magento\Framework\Mail\MessageInterface $message, $parameters = null)
     {
         $this->zendTransport = new \Zend\Mail\Transport\Sendmail($parameters);
-        $this->_message = $message;
+        $this->message = $message;
     }
 
     /**
@@ -38,7 +39,7 @@ public function sendMessage()
     {
         try {
             $this->zendTransport->send(
-                \Zend\Mail\Message::fromString($this->_message->getRawMessage())
+                \Zend\Mail\Message::fromString($this->message->getRawMessage())
             );
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);