Merge pull request #7812 from magento-atwix-pyrrans/AC-3580-remove-zend-mail

[Pyrrans] AC-3580 Remove usages of Zend_Mail

Author: xmav

dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

@@ -8,8 +8,8 @@
 use Magento\Backend\App\Area\FrontNameResolver as BackendFrontNameResolver;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
@@ -26,12 +26,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Zend_Mail|\PHPUnit\Framework\MockObject\MockObject
-     */
-    protected $mail;
-
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
@@ -46,13 +41,8 @@ protected function mockModel($filesystem = null)
             $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         }
 
-        $this->mail = $this->getMockBuilder(\Zend_Mail::class)
-            ->setMethods(['send', 'addTo', 'addBcc', 'setReturnPath', 'setReplyTo'])
-            ->setConstructorArgs(['utf-8'])
-            ->getMock();
-
         $this->model = $this->getMockBuilder(\Magento\Email\Model\Template::class)
-            ->setMethods(['_getMail'])
+            ->addMethods([])
             ->setConstructorArgs(
                 [
                     $this->objectManager->get(\Magento\Framework\Model\Context::class),
@@ -73,25 +63,13 @@ protected function mockModel($filesystem = null)
             ->getMock();
 
         $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
-
-        $this->model->expects($this->any())->method('_getMail')->willReturnCallback([$this, 'getMail']);
         $this->model
             ->setSenderName('sender')
             ->setSenderEmail('sender@example.com')
             ->setTemplateSubject('Subject')
             ->setTemplateId('abc');
     }
 
-    /**
-     * Return a disposable \Zend_Mail instance
-     *
-     * @return \PHPUnit\Framework\MockObject\MockObject|\Zend_Mail
-     */
-    public function getMail()
-    {
-        return clone $this->mail;
-    }
-
     public function testSetGetTemplateFilter()
     {
         $this->mockModel();

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -4245,6 +4245,7 @@
     ['Zend_Feed', 'Laminas\Feed'],
     ['Zend_Uri', 'Laminas\Uri\Uri'],
     ['Zend_Mime', 'Magento\Framework\HTTP\Mime'],
+    ['Zend_Mail'],
     ['Magento\Framework\Encryption\Crypt', 'Magento\Framework\Encryption\EncryptionAdapterInterface'],
     ['Magento\Wishlist\Setup\Patch\Schema\AddProductIdConstraint'],
     ['Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection'],