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

Author: Cari Spruiell

app/code/Magento/Authorizenet/Model/Directpost.php

@@ -898,4 +898,26 @@ protected function addStatusCommentOnUpdate(
         }
         return $this;
     }
+
+    /**
+     * Sets method code
+     *
+     * @param string $methodCode
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @return void
+     */
+    public function setMethodCode($methodCode)
+    {
+    }
+
+    /**
+     * Sets path pattern
+     *
+     * @param string $pathPattern
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @return void
+     */
+    public function setPathPattern($pathPattern)
+    {
+    }
 }

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -45,19 +45,21 @@
         <?php endif; ?>
         <button type="submit"
                 name="update_cart_action"
+                data-cart-empty=""
                 value="empty_cart"
                 title="<?php echo $block->escapeHtml(__('Clear Shopping Cart')); ?>"
                 class="action clear" id="empty_cart_button">
             <span><?php echo __('Clear Shopping Cart'); ?></span>
         </button>
         <button type="submit"
                 name="update_cart_action"
+                data-cart-item-update=""
                 value="update_qty"
                 title="<?php echo $block->escapeHtml(__('Update Shopping Cart')); ?>"
                 class="action update">
             <span><?php echo __('Update Shopping Cart'); ?></span>
         </button>
-        <input type="hidden" value="" id="update_cart_action_container" />
+        <input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
     </div>
 </form>
 <?php echo $block->getChildHtml('checkout.cart.order.actions') ?>

app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

@@ -93,6 +93,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                 <div class="control qty">
                     <input id="cart-<?php echo $_item->getId() ?>-qty"
                            name="cart[<?php echo $_item->getId() ?>][qty]"
+                           data-cart-item-id="<?php echo $_item->getSku() ?>"
                            value="<?php echo $block->getQty() ?>"
                            type="number"
                            size="4"

app/code/Magento/Customer/Model/AccountManagement.php

@@ -14,10 +14,12 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\ValidationResultsInterfaceFactory;
 use Magento\Customer\Helper\View as CustomerViewHelper;
 use Magento\Customer\Model\Config\Share as ConfigShare;
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\Metadata\Validator;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Encryption\EncryptorInterface as Encryptor;
 use Magento\Framework\Event\ManagerInterface;
@@ -30,6 +32,8 @@
 use Magento\Framework\Exception\State\ExpiredException;
 use Magento\Framework\Exception\State\InputMismatchException;
 use Magento\Framework\Exception\State\InvalidTransitionException;
+use Magento\Framework\ObjectFactory;
+use Magento\Framework\Registry;
 use Psr\Log\LoggerInterface as PsrLogger;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Mail\Template\TransportBuilder;
@@ -205,11 +209,10 @@ class AccountManagement implements AccountManagementInterface
      * @param StoreManagerInterface $storeManager
      * @param Random $mathRandom
      * @param Validator $validator
-     * @param \Magento\Customer\Api\Data\ValidationResultsInterfaceFactory $validationResultsDataFactory
+     * @param ValidationResultsInterfaceFactory $validationResultsDataFactory
      * @param AddressRepositoryInterface $addressRepository
      * @param CustomerMetadataInterface $customerMetadataService
      * @param CustomerRegistry $customerRegistry
-     * @param \Magento\Framework\Url $url
      * @param PsrLogger $logger
      * @param Encryptor $encryptor
      * @param ConfigShare $configShare
@@ -218,12 +221,12 @@ class AccountManagement implements AccountManagementInterface
      * @param ScopeConfigInterface $scopeConfig
      * @param TransportBuilder $transportBuilder
      * @param DataObjectProcessor $dataProcessor
-     * @param \Magento\Framework\Registry $registry
+     * @param Registry $registry
      * @param CustomerViewHelper $customerViewHelper
      * @param DateTime $dateTime
      * @param CustomerModel $customerModel
-     * @param \Magento\Framework\ObjectFactory $objectFactory
-     * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
+     * @param ObjectFactory $objectFactory
+     * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -233,11 +236,10 @@ public function __construct(
         StoreManagerInterface $storeManager,
         Random $mathRandom,
         Validator $validator,
-        \Magento\Customer\Api\Data\ValidationResultsInterfaceFactory $validationResultsDataFactory,
+        ValidationResultsInterfaceFactory $validationResultsDataFactory,
         AddressRepositoryInterface $addressRepository,
         CustomerMetadataInterface $customerMetadataService,
         CustomerRegistry $customerRegistry,
-        \Magento\Framework\Url $url,
         PsrLogger $logger,
         Encryptor $encryptor,
         ConfigShare $configShare,
@@ -246,12 +248,12 @@ public function __construct(
         ScopeConfigInterface $scopeConfig,
         TransportBuilder $transportBuilder,
         DataObjectProcessor $dataProcessor,
-        \Magento\Framework\Registry $registry,
+        Registry $registry,
         CustomerViewHelper $customerViewHelper,
         DateTime $dateTime,
         CustomerModel $customerModel,
-        \Magento\Framework\ObjectFactory $objectFactory,
-        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
+        ObjectFactory $objectFactory,
+        ExtensibleDataObjectConverter $extensibleDataObjectConverter
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -614,18 +616,19 @@ public function changePasswordById($customerId, $currentPassword, $newPassword)
     /**
      * Change customer password.
      *
-     * @param string $email
+     * @param CustomerModel $customer
      * @param string $currentPassword
      * @param string $newPassword
      * @return bool true on success
+     * @throws InputException
+     * @throws InvalidEmailOrPasswordException
      */
     private function changePasswordForCustomer($customer, $currentPassword, $newPassword)
     {
         $customerSecure = $this->customerRegistry->retrieveSecureData($customer->getId());
         $hash = $customerSecure->getPasswordHash();
         if (!$this->encryptor->validateHash($currentPassword, $hash)) {
-            throw new InvalidEmailOrPasswordException(
-                __('The password doesn\'t match this account.'));
+            throw new InvalidEmailOrPasswordException(__('The password doesn\'t match this account.'));
         }
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);

app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html

@@ -9,7 +9,7 @@
 "var store.getUrl('customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
 "var customer.name":"Customer Name"
-@-->
+} @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Customer/view/frontend/email/password_new.html

@@ -8,7 +8,7 @@
 <!--@vars {
 "var store.getUrl('customer/account/')":"Customer Account URL",
 "var customer.name":"Customer Name"
-@-->
+} @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Customer/view/frontend/email/password_reset.html

@@ -7,7 +7,7 @@
 <!--@subject Your {{var store.getFrontendName()}} password has been changed @-->
 <!--@vars {
 "var customer.name":"Customer Name"
-@-->
+} @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html

@@ -8,7 +8,7 @@
 <!--@vars {
 "var customer.name":"Customer Name",
 "var store.getUrl('customer/account/createPassword/', [_query:[id:$customer.id, token:$customer.rp_token]])":"Reset Password URL"
-@-->
+} @-->
 {{template config_path="design/email/header_template"}}
 
 <p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml

@@ -87,7 +87,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
     <?php endif; ?>
         <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
             <div class="control qty">
-                <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $block->getQty() ?>" type="number" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{'required-number':true,'validate-greater-than-zero':true}" data-role="cart-item-qty"/>
+                <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $block->getQty() ?>" type="number" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" data-cart-item-id="<?php echo $block->escapeHtml(__($_item->getSku())) ?>" maxlength="12" data-validate="{'required-number':true,'validate-greater-than-zero':true}" data-role="cart-item-qty"/>
             </div>
             <?php $cols++; ?>
         </td>

app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php

@@ -41,13 +41,12 @@ public function execute()
             $parts = $this->emailConfig->parseTemplateIdParts($templateId);
             $templateId = $parts['templateId'];
             $theme = $parts['theme'];
+
             if ($theme) {
-                // If loading template from a theme folder, set theme so that appropriate template gets loaded
                 $template->setForcedTheme($templateId, $theme);
             }
-
-            // Since the $template model doesn't have its area set, set it so that theme loads from appropriate area
             $template->setForcedArea($templateId);
+
             $template->loadDefault($templateId);
             $template->setData('orig_template_code', $templateId);
             $template->setData('template_variables', \Zend_Json::encode($template->getVariablesOptionArray(true)));