From d0a9ca0228275019e57a036e64dce1951457ec2f Mon Sep 17 00:00:00 2001 From: Marcel Hauri Date: Fri, 1 Jun 2018 16:17:03 +0200 Subject: [PATCH 1/3] [task] remove zend_mail --- .../Magento/Email/Model/TemplateTest.php | 18 +++++++++--------- .../Test/Legacy/_files/obsolete_classes.php | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index a83de07443e..60ab7aa5ef1 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -8,7 +8,7 @@ use Magento\Backend\App\Area\FrontNameResolver as BackendFrontNameResolver; use Magento\Framework\App\Area; use Magento\Framework\App\Filesystem\DirectoryList; -use Magento\Framework\App\TemplateTypesInterface; +use Magento\Framework\App\TemplateTypesInterface;; use Magento\Framework\View\DesignInterface; use Magento\Store\Model\ScopeInterface; use Magento\Store\Model\Store; @@ -25,9 +25,9 @@ class TemplateTest extends \PHPUnit\Framework\TestCase protected $model; /** - * @var \Zend_Mail|\PHPUnit_Framework_MockObject_MockObject + * @var \Magento\Framework\Mail\Message|\PHPUnit_Framework_MockObject_MockObject */ - protected $mail; + protected $message; /** * @var \Magento\Framework\ObjectManagerInterface @@ -45,8 +45,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']) + $this->message = $this->getMockBuilder(\Magento\Framework\Mail\Message::class) + ->setMethods(['addTo', 'addBcc', 'setReplyTo']) ->setConstructorArgs(['utf-8']) ->getMock(); @@ -71,18 +71,18 @@ protected function mockModel($filesystem = null) $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend'); - $this->model->expects($this->any())->method('_getMail')->will($this->returnCallback([$this, 'getMail'])); + $this->model->expects($this->any())->method('_getMail')->will($this->returnCallback([$this, 'getMessage'])); $this->model->setSenderName('sender')->setSenderEmail('sender@example.com')->setTemplateSubject('Subject'); } /** - * Return a disposable \Zend_Mail instance + * Return a disposable \Magento\Framework\Mail\Message instance * * @return \PHPUnit_Framework_MockObject_MockObject|\Zend_Mail */ - public function getMail() + public function getMessage() { - return clone $this->mail; + return clone $this->message; } public function testSetGetTemplateFilter() diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index 78ab26401b0..5659c921ab0 100755 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -4237,4 +4237,5 @@ ['Zend_Feed', 'Zend\Feed'], ['Zend_Uri', 'Zend\Uri\Uri'], ['Zend_Mime', 'Magento\Framework\HTTP\Mime'], + ['Zend_Mail', 'Zend\Mail'], ]; From e71679d90a7025e1a46d11b80ed5c9938a7d7f26 Mon Sep 17 00:00:00 2001 From: Marcel Hauri Date: Fri, 1 Jun 2018 21:28:58 +0200 Subject: [PATCH 2/3] [fix] apply coding standards --- .../integration/testsuite/Magento/Email/Model/TemplateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index 60ab7aa5ef1..299624f099e 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -8,7 +8,7 @@ use Magento\Backend\App\Area\FrontNameResolver as BackendFrontNameResolver; use Magento\Framework\App\Area; use Magento\Framework\App\Filesystem\DirectoryList; -use Magento\Framework\App\TemplateTypesInterface;; +use Magento\Framework\App\TemplateTypesInterface; use Magento\Framework\View\DesignInterface; use Magento\Store\Model\ScopeInterface; use Magento\Store\Model\Store; From 0cb58bcdaf44d9dad88d311ad8849529346c1aff Mon Sep 17 00:00:00 2001 From: Marcel Hauri Date: Sun, 17 Jun 2018 12:33:02 +0200 Subject: [PATCH 3/3] [task] remove unused _getMail method --- .../testsuite/Magento/Email/Model/TemplateTest.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index 299624f099e..520b23694b4 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -51,7 +51,7 @@ protected function mockModel($filesystem = null) ->getMock(); $this->model = $this->getMockBuilder(\Magento\Email\Model\Template::class) - ->setMethods(['_getMail']) + ->setMethods(['mockableMethod']) ->setConstructorArgs([ $this->objectManager->get(\Magento\Framework\Model\Context::class), $this->objectManager->get(\Magento\Framework\View\DesignInterface::class), @@ -70,21 +70,9 @@ protected function mockModel($filesystem = null) ->getMock(); $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend'); - - $this->model->expects($this->any())->method('_getMail')->will($this->returnCallback([$this, 'getMessage'])); $this->model->setSenderName('sender')->setSenderEmail('sender@example.com')->setTemplateSubject('Subject'); } - /** - * Return a disposable \Magento\Framework\Mail\Message instance - * - * @return \PHPUnit_Framework_MockObject_MockObject|\Zend_Mail - */ - public function getMessage() - { - return clone $this->message; - } - public function testSetGetTemplateFilter() { $this->mockModel();