Merge remote-tracking branch 'mainline/2.3-develop' into MC-15763-develop

Author: adifucan

app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php

@@ -38,10 +38,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     {
         /** @var  $product \Magento\Catalog\Model\Product */
         $product = $observer->getEvent()->getProduct();
-        if ($product->getSpecialPrice() && ! $product->getSpecialFromDate()) {
+        if ($product->getSpecialPrice() && $product->getSpecialFromDate() === null) {
             $product->setData('special_from_date', $this->localeDate->date()->setTime(0, 0));
         }
-
         return $this;
     }
 }

app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml

@@ -13,6 +13,7 @@
         <element name="DefaultLabel" type="input" selector="#attribute_label"/>
         <element name="InputType" type="select" selector="#frontend_input"/>
         <element name="ValueRequired" type="select" selector="#is_required"/>
+        <element name="UpdateProductPreviewImage" type="select" selector="[name='update_product_preview_image']"/>
         <element name="AdvancedProperties" type="button" selector="#advanced_fieldset-wrapper"/>
         <element name="DefaultValue" type="input" selector="#default_value_text"/>
         <element name="Scope" type="select" selector="#is_global"/>

app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php

@@ -103,7 +103,7 @@ private function generateRequest($attributeType, $container, $useFulltext)
                 }
             }
             /** @var $attribute Attribute */
-            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price', 'sku'], true)) {
+            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price'], true)) {
                 // Some fields have their own specific handlers
                 continue;
             }

app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php

@@ -9,6 +9,9 @@
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorInterface;
 
+/**
+ * Test for \Magento\CatalogSearch\Model\Search\RequestGenerator
+ */
 class RequestGeneratorTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  */
@@ -61,7 +64,7 @@ public function attributesProvider()
         return [
             [
                 [
-                    'quick_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
+                    'quick_search_container' => ['queries' => 1, 'filters' => 0, 'aggregations' => 0],
                     'advanced_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
                     'catalog_view_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0]
                 ],

app/code/Magento/CatalogSearch/etc/search_request.xml

@@ -19,7 +19,6 @@
                 <queryReference clause="must" ref="visibility"/>
             </query>
             <query xsi:type="matchQuery" value="$search_term$" name="search">
-                <match field="sku"/>
                 <match field="*"/>
             </query>
             <query xsi:type="filteredQuery" name="category">

app/code/Magento/Checkout/Model/ShippingInformationManagement.php

@@ -191,7 +191,9 @@ public function saveAddressInformation(
 
         $shippingAddress = $quote->getShippingAddress();
 
-        if (!$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())) {
+        if (!$quote->getIsVirtual()
+            && !$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())
+        ) {
             throw new NoSuchEntityException(
                 __('Carrier with such method not found: %1, %2', $carrierCode, $methodCode)
             );

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

@@ -3,13 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller\Account;
 
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\ForgotPasswordToken\ConfirmCustomerByToken;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class CreatePassword
@@ -34,20 +38,30 @@ class CreatePassword extends \Magento\Customer\Controller\AbstractAccount implem
     protected $resultPageFactory;
 
     /**
-     * @param Context $context
-     * @param Session $customerSession
-     * @param PageFactory $resultPageFactory
-     * @param AccountManagementInterface $accountManagement
+     * @var \Magento\Customer\Model\ForgotPasswordToken\ConfirmCustomerByToken
+     */
+    private $confirmByToken;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Customer\Api\AccountManagementInterface $accountManagement
+     * @param \Magento\Customer\Model\ForgotPasswordToken\ConfirmCustomerByToken $confirmByToken
      */
     public function __construct(
         Context $context,
         Session $customerSession,
         PageFactory $resultPageFactory,
-        AccountManagementInterface $accountManagement
+        AccountManagementInterface $accountManagement,
+        ConfirmCustomerByToken $confirmByToken = null
     ) {
         $this->session = $customerSession;
         $this->resultPageFactory = $resultPageFactory;
         $this->accountManagement = $accountManagement;
+        $this->confirmByToken = $confirmByToken
+            ?? ObjectManager::getInstance()->get(ConfirmCustomerByToken::class);
+
         parent::__construct($context);
     }
 
@@ -67,6 +81,8 @@ public function execute()
         try {
             $this->accountManagement->validateResetPasswordLinkToken(null, $resetPasswordToken);
 
+            $this->confirmByToken->execute($resetPasswordToken);
+
             if ($isDirectLink) {
                 $this->session->setRpToken($resetPasswordToken);
                 $resultRedirect = $this->resultRedirectFactory->create();
@@ -77,16 +93,17 @@ public function execute()
                 /** @var \Magento\Framework\View\Result\Page $resultPage */
                 $resultPage = $this->resultPageFactory->create();
                 $resultPage->getLayout()
-                    ->getBlock('resetPassword')
-                    ->setResetPasswordLinkToken($resetPasswordToken);
+                           ->getBlock('resetPassword')
+                           ->setResetPasswordLinkToken($resetPasswordToken);
 
                 return $resultPage;
             }
         } catch (\Exception $exception) {
-            $this->messageManager->addError(__('Your password reset link has expired.'));
+            $this->messageManager->addErrorMessage(__('Your password reset link has expired.'));
             /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
             $resultRedirect->setPath('*/*/forgotpassword');
+
             return $resultRedirect;
         }
     }