Merge branch 'platform-health' of github.com:magento/magento2 into platform-health

sivaschenko · sivaschenko · commit 12ba63deb476 · 2021-09-06T09:06:54.000+01:00
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -34,7 +34,8 @@ var config = {
         'domReady': 'requirejs/domReady',
         'spectrum': 'jquery/spectrum/spectrum',
         'tinycolor': 'jquery/spectrum/tinycolor',
-        'jquery-ui-modules': 'jquery/ui-modules'
+        'jquery-ui-modules': 'jquery/ui-modules',
+        'matchMedia': 'mediaCheck'
     },
     deps: [
         'jquery/jquery-migrate'
diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -50,7 +50,7 @@
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery.parsequery.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
-        <item type="file">Lib::matchMedia.js</item>
+        <item type="file">Lib::mediaCheck.js</item>
         <item type="file">Lib::requirejs/require.js</item>
         <item type="file">Lib::requirejs/text.js</item>
         <item type="file">Lib::varien/js.js</item>
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogInventory\Model\Quote\Item;
 
 use Magento\Catalog\Model\Product;
@@ -14,64 +16,68 @@
 use Magento\Eav\Model\Config;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\DataObject;
 use Magento\Checkout\Model\Session;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class QuantityValidatorTest
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class QuantityValidatorTest extends \PHPUnit\Framework\TestCase
+class QuantityValidatorTest extends TestCase
 {
     /**
      * @var QuantityValidator
      */
     private $quantityValidator;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $observerMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $eventMock;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $optionInitializer;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject
      */
     private $stockState;
 
     /**
-     * @var \Magento\CatalogInventory\Observer\QuantityValidatorObserver
+     * @var QuantityValidatorObserver
      */
     private $observer;
 
     /**
-     * Set up
+     * @inheritdoc
      */
     protected function setUp(): void
     {
-        /** @var \Magento\Framework\ObjectManagerInterface objectManager */
+        /** @var ObjectManagerInterface objectManager */
         $this->objectManager = Bootstrap::getObjectManager();
         $this->observerMock = $this->createMock(Observer::class);
         $this->optionInitializer = $this->createMock(Option::class);
@@ -89,27 +95,36 @@ protected function setUp(): void
                 'quantityValidator' => $this->quantityValidator
             ]
         );
-        $this->eventMock = $this->createPartialMock(Event::class, ['getItem']);
+
+        $this->eventMock = $this->getMockBuilder(Event::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->addMethods(['getItem'])
+            ->getMock();
     }
 
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testQuoteWithOptions()
+    public function testQuoteWithOptions(): void
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
+        /** @var $session Session */
         $session = $this->objectManager->create(Session::class);
 
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         /** @var $product Product */
         $product = $productRepository->get('bundle-product');
         $resultMock = $this->createMock(DataObject::class);
         $this->stockState->expects($this->any())->method('checkQtyIncrements')->willReturn($resultMock);
-        /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
-        $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
+        /* @var $quoteItem Item */
+        $quoteItem = $this->getQuoteItemIdByProductId($session->getQuote(), $product->getId());
         $this->observerMock->expects($this->once())->method('getEvent')->willReturn($this->eventMock);
         $this->optionInitializer->expects($this->any())->method('initialize')->willReturn($resultMock);
         $this->eventMock->expects($this->once())->method('getItem')->willReturn($quoteItem);
@@ -121,21 +136,26 @@ public function testQuoteWithOptions()
      * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product.php
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testQuoteWithOptionsWithErrors()
+    public function testQuoteWithOptionsWithErrors(): void
     {
-        /** @var $session \Magento\Checkout\Model\Session  */
+        /** @var $session Session */
         $session = $this->objectManager->create(Session::class);
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        /** @var ProductRepositoryInterface $productRepository */
         $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         /** @var $product Product */
         $product = $productRepository->get('bundle-product');
-        /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
-        $quoteItem = $this->_getQuoteItemIdByProductId($session->getQuote(), $product->getId());
-        $resultMock = $this->createPartialMock(
-            DataObject::class,
-            ['checkQtyIncrements', 'getMessage', 'getQuoteMessage', 'getHasError']
-        );
+        /* @var $quoteItem Item */
+        $quoteItem = $this->getQuoteItemIdByProductId($session->getQuote(), $product->getId());
+        $resultMock = $this->getMockBuilder(DataObject::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->addMethods(['checkQtyIncrements', 'getMessage', 'getQuoteMessage', 'getHasError'])
+            ->getMock();
         $this->observerMock->expects($this->once())->method('getEvent')->willReturn($this->eventMock);
         $this->eventMock->expects($this->once())->method('getItem')->willReturn($quoteItem);
         $this->stockState->expects($this->any())->method('checkQtyIncrements')->willReturn($resultMock);
@@ -150,10 +170,12 @@ public function testQuoteWithOptionsWithErrors()
      * Set mock of Stock State Result to Quote Item Options.
      *
      *
-     * @param \Magento\Quote\Model\Quote\Item $quoteItem
-     * @param \PHPUnit\Framework\MockObject\MockObject $resultMock
+     * @param Item $quoteItem
+     * @param MockObject $resultMock
+     *
+     * @return void
      */
-    private function setMockStockStateResultToQuoteItemOptions($quoteItem, $resultMock)
+    private function setMockStockStateResultToQuoteItemOptions($quoteItem, $resultMock): void
     {
         if ($options = $quoteItem->getQtyOptions()) {
             foreach ($options as $option) {
@@ -252,27 +274,29 @@ public function quantityDataProvider(): array
             [
                 'quantity' => 1000,
                 'error_regexp' => ''
-            ],
-
+            ]
         ];
     }
 
     /**
-     * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
+     * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id.
      *
      * @param Quote $quote
      * @param int $productId
-     * @return \Magento\Quote\Model\Quote\Item
+     *
+     * @return Item
      */
-    private function _getQuoteItemIdByProductId($quote, $productId)
+    private function getQuoteItemIdByProductId($quote, $productId): Item
     {
-        /** @var $quoteItems \Magento\Quote\Model\Quote\Item[] */
+        /** @var $quoteItems Item[] */
         $quoteItems = $quote->getAllItems();
+
         foreach ($quoteItems as $quoteItem) {
             if ($productId == $quoteItem->getProductId()) {
                 return $quoteItem;
             }
         }
-        $this->fail('Test failed since no quoteItem found by productId '.$productId);
+
+        $this->fail('Test failed since no quoteItem found by productId ' . $productId);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/Billing/AgreementTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/Billing/AgreementTest.php
@@ -3,13 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Controller\Billing;
 
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Payment\Helper\Data;
+use Magento\Paypal\Controller\Billing\Agreement\ReturnWizard;
+use Magento\Paypal\Model\Express;
+use Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection;
+use Magento\Store\Model\StoreManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\AbstractController;
+
 /**
  * Test class for \Magento\Paypal\Controller\Billing\Agreement
  */
-class AgreementTest extends \Magento\TestFramework\TestCase\AbstractController
+class AgreementTest extends AbstractController
 {
     /**
      * Test billing agreement record creation in Magento DB.
@@ -20,44 +33,46 @@ class AgreementTest extends \Magento\TestFramework\TestCase\AbstractController
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDbIsolation enabled
      * @magentoAppArea frontend
+     *
+     * @return void
      */
-    public function testReturnWizardAction()
+    public function testReturnWizardAction(): void
     {
         $paymentMethod = "paypal_express";
         $token = "token_value";
         $referenceId = "Reference-id-1";
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** Mock Request */
-        $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class, [], '', false);
-        $requestMock
-            ->expects($this->any())
+        $requestMock = $this->getMockForAbstractClass(RequestInterface::class, [], '', false);
+        $requestMock->expects($this->any())
             ->method('getParam')
             ->willReturnMap(
-                
-                    [
-                        ['payment_method', null, $paymentMethod],
-                        ['token', null, $token],
-                    ]
-                
+                [
+                    ['payment_method', null, $paymentMethod],
+                    ['token', null, $token]
+                ]
             );
 
         /**
          * Disable billing agreement placement using calls to remote system
          * in \Magento\Paypal\Model\Billing\Agreement::place()
          */
-        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
-        $paymentMethodMock = $this->createPartialMock(
-            \Magento\Paypal\Model\Express::class,
-            ['getTitle', 'setStore', 'placeBillingAgreement']
-        );
+        $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
+        $paymentMethodMock = $this->getMockBuilder(Express::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->onlyMethods(['getTitle', 'setStore'])
+            ->addMethods(['placeBillingAgreement'])
+            ->getMock();
         $paymentMethodMock->expects($this->any())->method('placeBillingAgreement')->willReturnSelf();
         $paymentMethodMock->expects($this->any())->method('getTitle')->willReturn($paymentMethod);
 
-        $paymentHelperMock = $this->createPartialMock(\Magento\Payment\Helper\Data::class, ['getMethodInstance']);
-        $paymentHelperMock
-            ->expects($this->any())
+        $paymentHelperMock = $this->createPartialMock(Data::class, ['getMethodInstance']);
+        $paymentHelperMock->expects($this->any())
             ->method('getMethodInstance')
             ->willReturn($paymentMethodMock);
         $billingAgreement = $objectManager->create(
@@ -66,50 +81,46 @@ public function testReturnWizardAction()
         );
         /** Reference ID is normally set by placeBillingAgreement() and is an agreement ID in the external system. */
         $billingAgreement->setBillingAgreementId($referenceId);
-        $objectManagerMock
-            ->expects($this->once())
+        $objectManagerMock->expects($this->once())
             ->method('create')
             ->with(\Magento\Paypal\Model\Billing\Agreement::class, [])
             ->willReturn($billingAgreement);
-        $storeManager = $objectManager->get(\Magento\Store\Model\StoreManager::class);
-        $customerSession = $objectManager->get(\Magento\Customer\Model\Session::class);
-        $objectManagerMock
-            ->expects($this->any())
+        $storeManager = $objectManager->get(StoreManager::class);
+        $customerSession = $objectManager->get(Session::class);
+        $objectManagerMock->expects($this->any())
             ->method('get')
             ->willReturnMap(
-                
-                    [
-                        [\Magento\Store\Model\StoreManager::class, $storeManager],
-                        [\Magento\Customer\Model\Session::class, $customerSession],
-                    ]
-                
+                [
+                    [StoreManager::class, $storeManager],
+                    [Session::class, $customerSession],
+                ]
             );
         $contextMock = $objectManager->create(
-            \Magento\Framework\App\Action\Context::class,
+            Context::class,
             [
                 'objectManager' => $objectManagerMock,
                 'request' => $requestMock
             ]
         );
         /** @var \Magento\Paypal\Controller\Billing\Agreement $billingAgreementController */
         $billingAgreementController = $objectManager->create(
-            \Magento\Paypal\Controller\Billing\Agreement\ReturnWizard::class,
+            ReturnWizard::class,
             ['context' => $contextMock]
         );
 
         /** Initialize current customer */
-        /** @var \Magento\Customer\Model\Session $customerSession */
-        $customerSession = $objectManager->get(\Magento\Customer\Model\Session::class);
+        /** @var Session $customerSession */
+        $customerSession = $objectManager->get(Session::class);
         $fixtureCustomerId = 1;
         $customerSession->setCustomerId($fixtureCustomerId);
 
         /** Execute SUT */
         $billingAgreementController->execute();
 
         /** Ensure that billing agreement record was created in the DB */
-        /** @var \Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection $billingAgreementCollection */
+        /** @var Collection $billingAgreementCollection */
         $billingAgreementCollection = $objectManager->create(
-            \Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection::class
+            Collection::class
         );
         /** @var \Magento\Paypal\Model\Billing\Agreement $createdBillingAgreement */
         $createdBillingAgreement = $billingAgreementCollection->getLastItem();
diff --git a/lib/web/matchMedia.js b/lib/web/matchMedia.js
diff --git a/lib/web/mediaCheck.js b/lib/web/mediaCheck.js
