[EngCom] Public Pull Requests - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

@@ -103,13 +103,13 @@ public function testGetAllWebsitesValue()
         $this->webSiteModel->expects($this->once())->method('getBaseCurrency')->willReturn($currency);
 
         $expectedResult = AdvancedPricing::VALUE_ALL_WEBSITES . ' [' . $currencyCode . ']';
-        $this->websiteString = $this->getMockBuilder(
+        $websiteString = $this->getMockBuilder(
             \Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\Website::class
         )
             ->setMethods(['_clearMessages', '_addMessages'])
             ->setConstructorArgs([$this->storeResolver, $this->webSiteModel])
             ->getMock();
-        $result = $this->websiteString->getAllWebsitesValue();
+        $result = $websiteString->getAllWebsitesValue();
 
         $this->assertEquals($expectedResult, $result);
     }

app/code/Magento/Catalog/i18n/en_US.csv

@@ -233,7 +233,6 @@ Products,Products
 "This attribute set no longer exists.","This attribute set no longer exists."
 "You saved the attribute set.","You saved the attribute set."
 "Something went wrong while saving the attribute set.","Something went wrong while saving the attribute set."
-"You added product %1 to the comparison list.","You added product %1 to the comparison list."
 "You cleared the comparison list.","You cleared the comparison list."
 "Something went wrong  clearing the comparison list.","Something went wrong  clearing the comparison list."
 "You removed product %1 from the comparison list.","You removed product %1 from the comparison list."
@@ -808,4 +807,5 @@ Details,Details
 "Product Name or SKU", "Product Name or SKU"
 "Start typing to find products", "Start typing to find products"
 "Product with ID: (%1) doesn't exist", "Product with ID: (%1) doesn't exist"
-"Category with ID: (%1) doesn't exist", "Category with ID: (%1) doesn't exist"
+"Category with ID: (%1) doesn't exist", "Category with ID: (%1) doesn't exist"
+"You added product %1 to the <a href=""%2"">comparison list</a>.","You added product %1 to the <a href=""%2"">comparison list</a>."

app/code/Magento/CatalogImportExport/Model/Import/Uploader.php

@@ -101,7 +101,7 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\Filesystem\File\ReadFactory $readFactory
-     * @param null $filePath
+     * @param null|string $filePath
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
@@ -113,15 +113,15 @@ public function __construct(
         \Magento\Framework\Filesystem\File\ReadFactory $readFactory,
         $filePath = null
     ) {
-        if ($filePath !== null) {
-            $this->_setUploadFile($filePath);
-        }
         $this->_imageFactory = $imageFactory;
         $this->_coreFileStorageDb = $coreFileStorageDb;
         $this->_coreFileStorage = $coreFileStorage;
         $this->_validator = $validator;
         $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $this->_readFactory = $readFactory;
+        if ($filePath !== null) {
+            $this->_setUploadFile($filePath);
+        }
     }
 
     /**
@@ -353,7 +353,7 @@ protected function _moveFile($tmpPath, $destPath)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function chmod($file)
     {

app/code/Magento/Checkout/i18n/en_US.csv

@@ -182,3 +182,4 @@ Payment,Payment
 "Items in Cart","Items in Cart"
 "Close","Close"
 "Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
+"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php

@@ -158,7 +158,7 @@ protected function getVariationMatrix()
             $configurableMatrix = json_decode($configurableMatrix, true);
 
             foreach ($configurableMatrix as $item) {
-                if ($item['newProduct']) {
+                if (isset($item['newProduct']) && $item['newProduct']) {
                     $result[$item['variationKey']] = $this->mapData($item);
 
                     if (isset($item['qty'])) {

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php

@@ -57,7 +57,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -102,7 +102,7 @@ protected function _prepareCollection()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _prepareColumns()
     {
@@ -123,7 +123,8 @@ protected function _prepareColumns()
                 'header' => __('Order Total'),
                 'index' => 'grand_total',
                 'type' => 'currency',
-                'currency' => 'order_currency_code'
+                'currency' => 'order_currency_code',
+                'rate'  => 1
             ]
         );
 
@@ -162,7 +163,7 @@ public function getRowUrl($row)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getGridUrl()
     {

app/code/Magento/Customer/Controller/Account/ForgotPassword.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,6 +10,9 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
+/**
+ * Forgot Password controller
+ */
 class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
@@ -41,10 +43,17 @@ public function __construct(
     /**
      * Forgot customer password page
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\View\Result\Page
      */
     public function execute()
     {
+        if ($this->session->isLoggedIn()) {
+            /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+            $resultRedirect = $this->resultRedirectFactory->create();
+            $resultRedirect->setPath('*/*/');
+            return $resultRedirect;
+        }
+
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->getBlock('forgotPassword')->setEmailValue($this->session->getForgottenEmail());

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

@@ -681,8 +681,8 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
-        $this->sessionManager->destroy();
         $this->destroyCustomerSessions($customer->getId());
+        $this->sessionManager->destroy();
         $this->customerRepository->save($customer);
 
         return true;

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

@@ -83,7 +83,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function processAuthenticationFailure($customerId)
     {
@@ -120,7 +120,7 @@ public function processAuthenticationFailure($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function unlock($customerId)
     {
@@ -152,7 +152,7 @@ protected function getMaxFailures()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isLocked($customerId)
     {
@@ -161,13 +161,13 @@ public function isLocked($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function authenticate($customerId, $password)
     {
         $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
         $hash = $customerSecure->getPasswordHash();
-        if (!$this->encryptor->validateHash($password, $hash)) {
+        if (!$hash || !$this->encryptor->validateHash($password, $hash)) {
             $this->processAuthenticationFailure($customerId);
             if ($this->isLocked($customerId)) {
                 throw new UserLockedException(__('The account is locked.'));

app/code/Magento/Developer/etc/di.xml

@@ -240,4 +240,12 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
+        <arguments>
+            <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_storefront</argument>
+            <argument name="debugHintsWithParam" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
+            <argument name="debugHintsParameter" xsi:type="string">dev/debug/template_hints_parameter_value</argument>
+        </arguments>
+    </type>
 </config>