Merge remote-tracking branch...

Merge remote-tracking branch 'remotes/classyllama/MAGETWO-37843-responsive-email-templates-in-blank-theme' into MAGETWO-37843-responsive-email-templates-in-blank-theme

# Conflicts:
#	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

app/code/Magento/User/Model/User.php

@@ -5,9 +5,11 @@
  */
 namespace Magento\User\Model;
 
+use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Backend\Model\Auth\Credential\StorageInterface;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Store\Model\Store;
 use Magento\User\Api\Data\UserInterface;
 
 /**
@@ -365,20 +367,13 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      */
     public function sendPasswordResetConfirmationEmail()
     {
-        // Set all required params and send emails
-        /** @var \Magento\Framework\Mail\TransportInterface $transport */
-        $transport = $this->_transportBuilder->setTemplateIdentifier(
-            $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE)
-        )->setTemplateOptions(
-            ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => 0]
-        )->setTemplateVars(
-            ['user' => $this, 'store' => $this->_storeManager->getStore(0)]
-        )->setFrom(
-            $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY)
-        )->addTo(
-            $this->getEmail(),
-            $this->getName()
-        )->getTransport();
+        $templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
+        $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
+            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
+            ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
+            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
+            ->addTo($this->getEmail(), $this->getName())
+            ->getTransport();
 
         $transport->sendMessage();
         return $this;
@@ -391,20 +386,13 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      */
     public function sendPasswordResetNotificationEmail()
     {
-        // Set all required params and send emails
-        /** @var \Magento\Framework\Mail\TransportInterface $transport */
-        $transport = $this->_transportBuilder->setTemplateIdentifier(
-            $this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE)
-        )->setTemplateOptions(
-            ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => 0]
-        )->setTemplateVars(
-            ['user' => $this, 'store' => $this->_storeManager->getStore(0)]
-        )->setFrom(
-            $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY)
-        )->addTo(
-            $this->getEmail(),
-            $this->getName()
-        )->getTransport();
+        $templateId = $this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE);
+        $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
+            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
+            ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
+            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
+            ->addTo($this->getEmail(), $this->getName())
+            ->getTransport();
 
         $transport->sendMessage();
         return $this;

app/code/Magento/User/view/adminhtml/email/password_reset.html

@@ -16,3 +16,5 @@
 
 {{trans "If you did not request this change, please contact us."}}
 
+{{trans "Thank you,"}}
+{{var store.getFrontendName()}}

app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html

@@ -19,3 +19,6 @@
 {{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}
 
 {{trans "If you did not make this request, you can ignore this email and your password will remain the same."}}
+
+{{trans "Thank you,"}}
+{{var store.getFrontendName()}}

lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php

@@ -6,10 +6,14 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Mail\Template;
 
+use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\Mail\Message;
+use Magento\Framework\Mail\MessageInterface;
+use Magento\Framework\Mail\TransportInterfaceFactory;
+use Magento\Framework\ObjectManagerInterface;
+
 class TransportBuilder
 {
     /**
@@ -75,17 +79,17 @@ class TransportBuilder
 
     /**
      * @param FactoryInterface $templateFactory
-     * @param \Magento\Framework\Mail\Message $message
-     * @param \Magento\Framework\Mail\Template\SenderResolverInterface $senderResolver
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     * @param \Magento\Framework\Mail\TransportInterfaceFactory $mailTransportFactory
+     * @param Message $message
+     * @param SenderResolverInterface $senderResolver
+     * @param ObjectManagerInterface $objectManager
+     * @param TransportInterfaceFactory $mailTransportFactory
      */
     public function __construct(
-        \Magento\Framework\Mail\Template\FactoryInterface $templateFactory,
-        \Magento\Framework\Mail\Message $message,
-        \Magento\Framework\Mail\Template\SenderResolverInterface $senderResolver,
-        \Magento\Framework\ObjectManagerInterface $objectManager,
-        \Magento\Framework\Mail\TransportInterfaceFactory $mailTransportFactory
+        FactoryInterface $templateFactory,
+        Message $message,
+        SenderResolverInterface $senderResolver,
+        ObjectManagerInterface $objectManager,
+        TransportInterfaceFactory $mailTransportFactory
     ) {
         $this->templateFactory = $templateFactory;
         $this->message = $message;
@@ -229,13 +233,9 @@ class TransportBuilder
      */
     protected function getTemplate()
     {
-        return $this->templateFactory->get(
-            $this->templateIdentifier
-        )->setVars(
-            $this->templateVars
-        )->setOptions(
-            $this->templateOptions
-        );
+        return $this->templateFactory->get($this->templateIdentifier)
+            ->setVars($this->templateVars)
+            ->setOptions($this->templateOptions);
     }
 
     /**
@@ -247,18 +247,14 @@ class TransportBuilder
     {
         $template = $this->getTemplate();
         $types = [
-            \Magento\Framework\App\TemplateTypesInterface::TYPE_TEXT => \Magento\Framework\Mail\MessageInterface::TYPE_TEXT,
-            \Magento\Framework\App\TemplateTypesInterface::TYPE_HTML => \Magento\Framework\Mail\MessageInterface::TYPE_HTML,
+            TemplateTypesInterface::TYPE_TEXT => MessageInterface::TYPE_TEXT,
+            TemplateTypesInterface::TYPE_HTML => MessageInterface::TYPE_HTML,
         ];
 
         $body = $template->processTemplate();
-        $this->message->setMessageType(
-            $types[$template->getType()]
-        )->setBody(
-            $body
-        )->setSubject(
-            $template->getSubject()
-        );
+        $this->message->setMessageType($types[$template->getType()])
+            ->setBody($body)
+            ->setSubject($template->getSubject());
 
         return $this;
     }