Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-71696

# Conflicts:
#	app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php
#	app/code/Magento/Checkout/Controller/Cart/Addgroup.php
#	app/code/Magento/Customer/Block/CustomerScopeData.php
#	app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
#	app/code/Magento/Sitemap/Helper/Data.php
#	app/code/Magento/Sitemap/Model/Sitemap.php
#	dev/tests/static/testsuite/Magento/Test/Js/_files/jshint/blacklist/core.txt
#	lib/internal/Magento/Framework/Mail/Message.php
#	lib/internal/Magento/Framework/Mail/Transport.php
#	lib/internal/Magento/Framework/Mail/TransportInterface.php

Author: slavvka

app/code/Magento/Email/Model/Transport.php

@@ -9,11 +9,14 @@
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Mail\MessageInterface;
 use Magento\Framework\Mail\TransportInterface;
+use Magento\Framework\Phrase;
 use Magento\Store\Model\ScopeInterface;
+use Zend\Mail\Message;
+use Zend\Mail\Transport\Sendmail;
 
 /**
  * Class that responsible for filling some message data before transporting it.
- * @see Zend_Mail_Transport_Sendmail is used for transport
+ * @see \Zend\Mail\Transport\Sendmail is used for transport
  */
 class Transport implements TransportInterface
 {
@@ -29,79 +32,59 @@ class Transport implements TransportInterface
     const XML_PATH_SENDING_RETURN_PATH_EMAIL = 'system/smtp/return_path_email';
 
     /**
-     * Object for sending eMails
-     *
-     * @var \Zend_Mail_Transport_Sendmail
+     * @var Sendmail
      */
-    private $transport;
+    private $zendTransport;
 
     /**
-     * Email message object that should be instance of \Zend_Mail
-     *
      * @var MessageInterface
      */
     private $message;
 
     /**
-     * Core store config
-     *
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @param \Zend_Mail_Transport_Sendmail $transport
      * @param MessageInterface $message Email message object
      * @param ScopeConfigInterface $scopeConfig Core store config
-     * @param string|array|\Zend_Config|null $parameters Config options for sendmail parameters
-     *
-     * @throws \InvalidArgumentException when $message is not an instance of \Zend_Mail
+     * @param null|string|array|\Traversable $parameters Config options for sendmail parameters
      */
     public function __construct(
-        \Zend_Mail_Transport_Sendmail $transport,
         MessageInterface $message,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        $parameters = null
     ) {
-        if (!$message instanceof \Zend_Mail) {
-            throw new \InvalidArgumentException('The message should be an instance of \Zend_Mail');
+        /* configuration of whether return path should be set or no. Possible values are:
+             * 0 - no
+             * 1 - yes (set value as FROM address)
+             * 2 - use custom value
+             * @see Magento\Config\Model\Config\Source\Yesnocustom
+             */
+        $isSetReturnPath = $scopeConfig->getValue(
+            self::XML_PATH_SENDING_SET_RETURN_PATH,
+            ScopeInterface::SCOPE_STORE
+        );
+        $returnPathValue = $scopeConfig->getValue(
+            self::XML_PATH_SENDING_RETURN_PATH_EMAIL,
+            ScopeInterface::SCOPE_STORE
+        );
+
+        if ($isSetReturnPath == '2' && $returnPathValue !== null) {
+            $parameters .= ' -f' . \escapeshellarg($returnPathValue);
         }
-        $this->transport = $transport;
+
+        $this->zendTransport = new Sendmail($parameters);
         $this->message = $message;
-        $this->scopeConfig = $scopeConfig;
     }
 
     /**
-     * Sets Return-Path to email if necessary, and sends email if it is allowed by System Configurations
-     *
-     * @return void
-     * @throws MailException
+     * @inheritdoc
      */
     public function sendMessage()
     {
         try {
-            /* configuration of whether return path should be set or no. Possible values are:
-             * 0 - no
-             * 1 - yes (set value as FROM address)
-             * 2 - use custom value
-             * @see Magento\Config\Model\Config\Source\Yesnocustom
-             */
-            $isSetReturnPath = $this->scopeConfig->getValue(
-                self::XML_PATH_SENDING_SET_RETURN_PATH,
-                ScopeInterface::SCOPE_STORE
+            $this->zendTransport->send(
+                Message::fromString($this->message->getRawMessage())
             );
-            $returnPathValue = $this->scopeConfig->getValue(
-                self::XML_PATH_SENDING_RETURN_PATH_EMAIL,
-                ScopeInterface::SCOPE_STORE
-            );
-
-            if ($isSetReturnPath == '1') {
-                $this->message->setReturnPath($this->message->getFrom());
-            } elseif ($isSetReturnPath == '2' && $returnPathValue !== null) {
-                $this->message->setReturnPath($returnPathValue);
-            }
-            $this->transport->send($this->message);
         } catch (\Exception $e) {
-            throw new MailException(__($e->getMessage()), $e);
+            throw new MailException(new Phrase($e->getMessage()), $e);
         }
     }
 

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

@@ -5,42 +5,44 @@
  */
 namespace Magento\Framework\Mail;
 
+use Magento\Framework\Exception\MailException;
+use Magento\Framework\Phrase;
+use Zend\Mail\Message;
+use Zend\Mail\Transport\Sendmail;
+
 class Transport implements \Magento\Framework\Mail\TransportInterface
 {
     /**
-     * @var \Zend\Mail\Transport\Sendmail
+     * @var Sendmail
      */
     private $zendTransport;
+
     /**
-     * @var \Magento\Framework\Mail\MessageInterface
+     * @var MessageInterface
      */
     private $message;
 
     /**
      * @param MessageInterface $message
-     * @param null $parameters
-     * @throws \InvalidArgumentException
+     * @param null|string|array|\Traversable $parameters
      */
-    public function __construct(\Magento\Framework\Mail\MessageInterface $message, $parameters = null)
+    public function __construct(MessageInterface $message, $parameters = null)
     {
-        $this->zendTransport = new \Zend\Mail\Transport\Sendmail($parameters);
+        $this->zendTransport = new Sendmail($parameters);
         $this->message = $message;
     }
 
     /**
-     * Send a mail using this transport
-     *
-     * @return void
-     * @throws \Magento\Framework\Exception\MailException
+     * @inheritdoc
      */
     public function sendMessage()
     {
         try {
             $this->zendTransport->send(
-                \Zend\Mail\Message::fromString($this->message->getRawMessage())
+                Message::fromString($this->message->getRawMessage())
             );
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\MailException(new \Magento\Framework\Phrase($e->getMessage()), $e);
+            throw new MailException(new Phrase($e->getMessage()), $e);
         }
     }