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

 - Merge Pull Request #8608 from schmengler/magento2:zend-mail-2
 - Merged commits:
   1. 3309db2
   2. 584a17a
   3. ca1a3b2
   4. d1be154
   5. 0d2f2a6
   6. c1d8e0d
   7. 0be511c
   8. 00bc417
   9. e02e28d
   10. dd755bc
   11. e7f62fe
   12. b633cd3
   13. b7186fc

Author: Oleksii Korshenko

app/code/Magento/Newsletter/Model/Template.php

@@ -38,12 +38,6 @@
  */
 class Template extends \Magento\Email\Model\AbstractTemplate
 {
-    /**
-     * Mail object
-     *
-     * @var \Zend_Mail
-     */
-    protected $_mail;
 
     /**
      * Store manager to emulate design

composer.json

@@ -17,6 +17,7 @@
         "zendframework/zend-validator": "^2.6.0",
         "zendframework/zend-crypt": "^2.6.0",
         "zendframework/zend-console": "^2.6.0",
+        "zendframework/zend-mail": "^2.8.0",
         "zendframework/zend-modulemanager": "^2.7",
         "zendframework/zend-mvc": "~2.6.3",
         "zendframework/zend-text": "^2.6.0",

composer.lock

@@ -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('[email protected]');
+        /** @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/Newsletter/Model/SubscriberTest.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/EmailTest.php

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

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

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