Merge branch '2.4-develop' into 2.4-develop-prs

sidolov · web-flow · commit 0e43d408493b · 2022-03-29T08:52:13.000-05:00
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithMediaThumbGallerySliderTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductWithMediaThumbGallerySliderTest.xml
diff --git a/app/code/Magento/Customer/Observer/UpgradeOrderCustomerEmailObserver.php b/app/code/Magento/Customer/Observer/UpgradeOrderCustomerEmailObserver.php
@@ -66,6 +66,7 @@ public function execute(Observer $observer): void
         }
         $searchCriteria = $this->searchCriteriaBuilder
             ->addFilter(OrderInterface::CUSTOMER_ID, $customer->getId())
+            ->addFilter(OrderInterface::CUSTOMER_EMAIL, $originalCustomer->getEmail())
             ->create();
 
         /**
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeOrderCustomerEmailObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeOrderCustomerEmailObserverTest.php
@@ -171,7 +171,7 @@ private function setOriginalCustomerToEventMock(MockObject $originalCustomer): v
 
     private function setCustomerEmail(MockObject $originalCustomer, string $email): void
     {
-        $originalCustomer->expects($this->once())
+        $originalCustomer->expects($this->atLeastOnce())
             ->method('getEmail')
             ->willReturn($email);
     }
@@ -186,7 +186,7 @@ private function whenOrderRepositoryGetListIsCalled(MockObject $orderCollectionM
             ->method('create')
             ->willReturn($searchCriteriaMock);
 
-        $this->searchCriteriaBuilderMock->expects($this->once())
+        $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())
             ->method('addFilter')
             ->willReturn($this->searchCriteriaBuilderMock);
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
@@ -13,14 +13,15 @@
                 i18n: placeholder,
                 attr: {
                     id: index,
-                    placeholder: $t(placeholder)
+                    placeholder: $t(placeholder),
+                    'aria-label': $t(placeholder),
                 },
                 textInput: inputValue,
                 hasFocus: focused,
                 keyboard: {
                     13: apply.bind($data, false),
                     27: cancel
-                }"/>
+                }">
     <button class="action-submit" type="button" click="apply.bind($data, false)" attr="'aria-label': $t('Search')">
         <span translate="'Search'"></span>
     </button>
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
@@ -61,7 +61,8 @@ public function __construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @throws \LogicException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -79,6 +80,7 @@ public function call($serviceInfo, $arguments = [], $storeCode = null, $integrat
         // we're always using JSON
         $authHeader = [];
         $restServiceInfo = $serviceInfo['rest'];
+        $additionalHeaders = $restServiceInfo['headers'] ?? [];
         if (array_key_exists('token', $restServiceInfo)) {
             $authHeader = $oAuthClient->buildBearerTokenAuthorizationHeader($restServiceInfo['token']);
         } else {
@@ -90,7 +92,12 @@ public function call($serviceInfo, $arguments = [], $storeCode = null, $integrat
                 $httpMethod
             );
         }
-        $authHeader = array_merge($authHeader, ['Accept: application/json', 'Content-Type: application/json']);
+        $authHeader = array_merge(
+            $authHeader,
+            ['Accept: application/json', 'Content-Type: application/json'],
+            $additionalHeaders
+        );
+
         switch ($httpMethod) {
             case Request::HTTP_METHOD_GET:
                 $response = $this->restClient->get($resourcePath, [], $authHeader);
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
@@ -16,13 +16,13 @@
 
 class OrderGetTest extends WebapiAbstract
 {
-    const RESOURCE_PATH = '/V1/orders';
+    private const RESOURCE_PATH = '/V1/orders';
 
-    const SERVICE_READ_NAME = 'salesOrderRepositoryV1';
+    private const SERVICE_READ_NAME = 'salesOrderRepositoryV1';
 
-    const SERVICE_VERSION = 'V1';
+    private const SERVICE_VERSION = 'V1';
 
-    const ORDER_INCREMENT_ID = '100000001';
+    private const ORDER_INCREMENT_ID = '100000001';
 
     /**
      * @var ObjectManagerInterface
@@ -74,7 +74,7 @@ public function testOrderGet(): void
         $expectedShippingAddress = [
             'address_type' => 'shipping',
             'city' => 'Los Angeles',
-            'email' => 'customer@null.com',
+            'email' => 'customer@example.com',
             'postcode' => '11111',
             'region' => 'CA'
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
@@ -39,8 +39,8 @@
  */
 class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const CUSTOMER_ID = 1;
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const CUSTOMER_ID = 1;
 
     /** @var AccountManagementInterface */
     private $accountManagement;
@@ -685,7 +685,7 @@ public function testUpgradeOrderCustomerEmailObserverWhenEmailIsNotModified(): v
         $customerOrders = $this->orderRepository->getList($searchCriteria);
 
         foreach ($customerOrders as $customerOrder) {
-            $this->assertEquals('customer@null.com', $customerOrder->getCustomerEmail());
+            $this->assertEquals('customer@example.com', $customerOrder->getCustomerEmail());
         }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php
@@ -91,7 +91,7 @@ protected function login($customerId)
     private function prepareRequestData($invalidData = false)
     {
         $orderId = 100000001;
-        $email = $invalidData ? 'wrong@example.com' : 'customer@null.com';
+        $email = $invalidData ? 'wrong@example.com' : 'customer@example.com';
 
         /** @var FormKey $formKey */
         $formKey = $this->_objectManager->get(FormKey::class);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/CreditmemoSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -18,9 +18,9 @@
 
 class CreditmemoSenderTest extends TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const OLD_CUSTOMER_EMAIL = 'customer@null.com';
-    const ORDER_EMAIL = 'customer@null.com';
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const OLD_CUSTOMER_EMAIL = 'customer@example.com';
+    private const ORDER_EMAIL = 'customer@example.com';
 
     /**
      * @var CustomerRepository
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -28,9 +28,9 @@
  */
 class InvoiceSenderTest extends TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const OLD_CUSTOMER_EMAIL = 'customer@null.com';
-    const ORDER_EMAIL = 'customer@null.com';
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const OLD_CUSTOMER_EMAIL = 'customer@example.com';
+    private const ORDER_EMAIL = 'customer@example.com';
 
     /** @var ObjectManagerInterface */
     private $objectManager;
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -21,9 +21,9 @@
  */
 class ShipmentSenderTest extends \PHPUnit\Framework\TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const OLD_CUSTOMER_EMAIL = 'customer@null.com';
-    const ORDER_EMAIL = 'customer@null.com';
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const OLD_CUSTOMER_EMAIL = 'customer@example.com';
+    private const ORDER_EMAIL = 'customer@example.com';
 
     /**
      * @var CustomerRepository
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -64,7 +64,7 @@
     ->setOrderCurrencyCode('USD')
     ->setBaseCurrencyCode('USD')
     ->setCustomerIsGuest(true)
-    ->setCustomerEmail('customer@null.com')
+    ->setCustomerEmail('customer@example.com')
     ->setBillingAddress($billingAddress)
     ->setShippingAddress($shippingAddress)
     ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js
@@ -2660,7 +2660,7 @@ fotoramaVersion = '4.6.4';
             if (opts.navtype === 'slides') {
                 var pos = readPosition($navShaft, opts.navdir);
                 pos >= navShaftTouchTail.max ? isLeftDisable = true : isLeftDisable = false;
-                pos <= navShaftTouchTail.min ? isRightDisable = true : isRightDisable = false;
+                pos <= Math.round(navShaftTouchTail.min) ? isRightDisable = true : isRightDisable = false;
             }
             $thumbArrLeft
                 .toggleClass(arrDisabledClass, isLeftDisable)

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public function execute(Observer $observer): void`
`66`	`66`	`}`
`67`	`67`	`$searchCriteria = $this->searchCriteriaBuilder`
`68`	`68`	`->addFilter(OrderInterface::CUSTOMER_ID, $customer->getId())`
	`69`	`+ ->addFilter(OrderInterface::CUSTOMER_EMAIL, $originalCustomer->getEmail())`
`69`	`70`	`->create();`
`70`	`71`
`71`	`72`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ private function setOriginalCustomerToEventMock(MockObject $originalCustomer): v`
`171`	`171`
`172`	`172`	`private function setCustomerEmail(MockObject $originalCustomer, string $email): void`
`173`	`173`	`{`
`174`		`- $originalCustomer->expects($this->once())`
	`174`	`+ $originalCustomer->expects($this->atLeastOnce())`
`175`	`175`	`->method('getEmail')`
`176`	`176`	`->willReturn($email);`
`177`	`177`	`}`
`@@ -186,7 +186,7 @@ private function whenOrderRepositoryGetListIsCalled(MockObject $orderCollectionM`
`186`	`186`	`->method('create')`
`187`	`187`	`->willReturn($searchCriteriaMock);`
`188`	`188`
`189`		`- $this->searchCriteriaBuilderMock->expects($this->once())`
	`189`	`+ $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())`
`190`	`190`	`->method('addFilter')`
`191`	`191`	`->willReturn($this->searchCriteriaBuilderMock);`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@`
`39`	`39`	`*/`
`40`	`40`	`class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase`
`41`	`41`	`{`
`42`		`- const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';`
`43`		`- const CUSTOMER_ID = 1;`
	`42`	`+ private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';`
	`43`	`+ private const CUSTOMER_ID = 1;`
`44`	`44`
`45`	`45`	`/** @var AccountManagementInterface */`
`46`	`46`	`private $accountManagement;`
`@@ -685,7 +685,7 @@ public function testUpgradeOrderCustomerEmailObserverWhenEmailIsNotModified(): v`
`685`	`685`	`$customerOrders = $this->orderRepository->getList($searchCriteria);`
`686`	`686`
`687`	`687`	`foreach ($customerOrders as $customerOrder) {`
`688`		`- $this->assertEquals('customer@null.com', $customerOrder->getCustomerEmail());`
	`688`	`+ $this->assertEquals('customer@example.com', $customerOrder->getCustomerEmail());`
`689`	`689`	`}`
`690`	`690`	`}`
`691`	`691`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ protected function login($customerId)`
`91`	`91`	`private function prepareRequestData($invalidData = false)`
`92`	`92`	`{`
`93`	`93`	`$orderId = 100000001;`
`94`		`- $email = $invalidData ? 'wrong@example.com' : 'customer@null.com';`
	`94`	`+ $email = $invalidData ? 'wrong@example.com' : 'customer@example.com';`
`95`	`95`
`96`	`96`	`/** @var FormKey $formKey */`
`97`	`97`	`$formKey = $this->_objectManager->get(FormKey::class);`