Merge remote-tracking branch 'trigger/AC-106' into AC-1434

magento · Oct 25, 2021 · 27a37e0 · 27a37e0
2 parents f150199 + 31c6a5c
commit 27a37e0
Show file tree

Hide file tree

Showing 162 changed files with 1,281 additions and 2,052 deletions.
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/SelectHydratorTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/SelectHydratorTest.php
@@ -198,7 +198,7 @@ public function testRecreateWithExpression(
             ->willReturn($this->selectMock);
         $withArgs = [];
 
-        foreach (array_keys($selectParts) as $key => $partName) {
+        foreach (array_keys($selectParts) as $partName) {
             $withArgs[] = [$partName, $expectedParts[$partName]];
         }
         $this->selectMock

diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php
@@ -195,10 +195,7 @@ protected function setUp(): void
         $args = ['context' => $contextMock];
 
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->controller = $testHelper->getObject(
-            Save::class,
-            $args
-        );
+        $this->controller = $testHelper->getObject(Save::class, $args);
     }
 
     /**

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -1383,8 +1383,7 @@ public function testPrepareForCartAdvancedAllRequiredOption(): void
                     'getBundleOption',
                     'getBundleOptionsData'
                 ]
-            )
-            ->disableOriginalConstructor()
+            )->disableOriginalConstructor()
             ->getMock();
         /* @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Catalog\Model\Product\Option $option */
         $option = $this->getMockBuilder(Option::class)
@@ -1405,8 +1404,7 @@ public function testPrepareForCartAdvancedAllRequiredOption(): void
                     'hasData',
                     'getData'
                 ]
-            )
-            ->addMethods(['getHasOptions', 'setCartQty', 'getSkipCheckRequiredOption'])
+            )->addMethods(['getHasOptions', 'setCartQty', 'getSkipCheckRequiredOption'])
             ->disableOriginalConstructor()
             ->getMock();
         /** @var MockObject|Type $productType */
@@ -1419,7 +1417,6 @@ public function testPrepareForCartAdvancedAllRequiredOption(): void
             ->onlyMethods(['getItems'])
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->parentClass($group, $option, $buyRequest, $product);
 
         $product->expects($this->any())
@@ -1444,7 +1441,6 @@ function ($key) use ($optionCollection) {
                             $resultValue = [0 => 5];
                             break;
                     }
-
                     return $resultValue;
                 }
             );
@@ -1456,8 +1452,7 @@ function ($key) use ($optionCollection) {
         $buyRequest->expects($this->once())
             ->method('getBundleOption')
             ->willReturn([3 => 5]);
-        $option
-            ->method('getId')
+        $option->method('getId')
             ->willReturnOnConsecutiveCalls(3);
         $option->expects($this->once())
             ->method('getRequired')

diff --git a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/BundlePanelTest.php b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/BundlePanelTest.php
@@ -135,22 +135,20 @@ public function testModifyMeta(string $shipmentTypePath, string $dataScope): voi
             ->willReturn([]);
         $this->arrayManagerMock->method('set')
             ->willReturn([]);
+
+        $metaArgument = [
+            $shipmentTypePath . BundlePanel::META_CONFIG_PATH,
+            [],
+            [
+                'dataScope' => $dataScope,
+                'validation' => [
+                    'required-entry' => false
+                ]
+            ]
+        ];
         $this->arrayManagerMock
             ->method('merge')
-            ->withConsecutive(
-                [], [], [], [], [], [], [], [], [], [], [], [],
-                [
-                    $shipmentTypePath . BundlePanel::META_CONFIG_PATH,
-                    [],
-                    [
-                        'dataScope' => $dataScope,
-                        'validation' => [
-                            'required-entry' => false
-                        ]
-                    ]
-                ]
-
-            );
+            ->withConsecutive([], [], [], [], [], [], [], [], [], [], [], [], $metaArgument);
         $this->bundlePanelModel->modifyMeta($sourceMeta);
     }
 

diff --git a/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php b/app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php
@@ -158,7 +158,8 @@ protected function setUp(): void
                     'delete',
                     'quoteInto',
                     'fetchAssoc'
-            ])
+                ]
+            )
             ->disableOriginalConstructor()
             ->getMock();
         $this->select = $this->createMock(Select::class);

diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
@@ -91,7 +91,6 @@ public function testSendPurgeRequest(array $hosts): void
         $connectWithArgs = $writeWithArgs = [];
 
         foreach ($uris as $uri) {
-            $withArgs[] = [$uri->getHost(), $uri->getPort()];
             $writeWithArgs[] = ['PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags', 'Host' => $uri->getHost()]];
         }
         $this->socketAdapterMock

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -13,9 +13,9 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-authorization": "*",
-        "laminas/laminas-captcha": "^2.10",
-        "laminas/laminas-db": "^2.8.2",
-        "laminas/laminas-session": "^2.10"
+        "laminas/laminas-captcha": "^2.11.0",
+        "laminas/laminas-db": "^2.13.4",
+        "laminas/laminas-session": "^2.12.0"
     },
     "type": "magento2-module",
     "license": [

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -168,7 +168,7 @@ public function execute()
             if (isset($categoryPostData['use_config']) && !empty($categoryPostData['use_config'])) {
                 foreach ($categoryPostData['use_config'] as $attributeCode => $attributeValue) {
                     if ($attributeValue) {
-                        $useConfig[] = $attributeValue;
+                        $useConfig[] = $attributeCode;
                         $category->setData($attributeCode, null);
                     }
                 }

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php
@@ -29,7 +29,7 @@
 class SaveHandlerTest extends TestCase
 {
     /**
-     * Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/CategoryTest.php
@@ -76,6 +76,7 @@ class CategoryTest extends TestCase
 
     /**
      * @inheritDoc
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function setUp(): void
     {
@@ -105,8 +106,7 @@ protected function setUp(): void
                     'getChildrenCategories',
                     'getIsActive'
                 ]
-            )
-            ->getMock();
+            )->getMock();
 
         $this->dataProvider
             ->method('getCategory')
@@ -153,8 +153,7 @@ protected function setUp(): void
                     'setValue',
                     'setCount'
                 ]
-            )
-            ->getMock();
+            )->getMock();
         $filterItem->expects($this->any())
             ->method($this->anything())->willReturnSelf();
         $this->filterItemFactory->expects($this->any())
@@ -192,12 +191,23 @@ protected function setUp(): void
     public function testApplyWithEmptyRequest($requestValue, $idValue): void
     {
         $requestField = 'test_request_var';
+        $idField = 'id';
 
         $this->target->setRequestVar($requestField);
 
         $this->request
             ->method('getParam')
-            ->with($requestField);
+            ->with($requestField)
+            ->willReturnCallback(
+                function ($field) use ($requestField, $idField, $requestValue, $idValue) {
+                    switch ($field) {
+                        case $requestField:
+                            return $requestValue;
+                        case $idField:
+                            return $idValue;
+                    }
+                }
+            );
 
         $result = $this->target->apply($this->request);
         $this->assertSame($this->target, $result);

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/PriceTest.php
@@ -203,7 +203,17 @@ public function testApplyWithEmptyRequest($requestValue, $idValue): void
 
         $this->request
             ->method('getParam')
-            ->with($requestField);
+            ->with($requestField)
+            ->willReturnCallback(
+                function ($field) use ($requestField, $idField, $requestValue, $idValue) {
+                    switch ($field) {
+                        case $requestField:
+                            return $requestValue;
+                        case $idField:
+                            return $idValue;
+                    }
+                }
+            );
 
         $result = $this->target->apply($this->request);
         $this->assertSame($this->target, $result);

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php
@@ -90,8 +90,8 @@ protected function setUp(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testGetList(): void
     {
         $productSku = 'simple_product';
@@ -106,17 +106,17 @@ public function testGetList(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testDelete(): void
     {
         $this->optionResourceMock->expects($this->once())->method('delete')->with($this->optionMock);
         $this->assertTrue($this->optionRepository->delete($this->optionMock));
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testGetNonExistingOption(): void
     {
         $this->expectException('Magento\Framework\Exception\NoSuchEntityException');
@@ -136,8 +136,8 @@ public function testGetNonExistingOption(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testGet(): void
     {
         $optionId = 1;
@@ -155,8 +155,8 @@ public function testGet(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testDeleteByIdentifierNonExistingOption(): void
     {
         $this->expectException('Magento\Framework\Exception\NoSuchEntityException');
@@ -177,8 +177,8 @@ public function testDeleteByIdentifierNonExistingOption(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testDeleteByIdentifier(): void
     {
         $optionId = 1;
@@ -200,8 +200,8 @@ public function testDeleteByIdentifier(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testDeleteByIdentifierWhenCannotRemoveOption(): void
     {
         $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
@@ -228,8 +228,8 @@ public function testDeleteByIdentifierWhenCannotRemoveOption(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testSaveCouldNotSaveException(): void
     {
         $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
@@ -239,8 +239,8 @@ public function testSaveCouldNotSaveException(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testSaveNoSuchEntityException(): void
     {
         $this->expectException('Magento\Framework\Exception\NoSuchEntityException');
@@ -261,8 +261,8 @@ public function testSaveNoSuchEntityException(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testSave(): void
     {
         $productSku = 'simple_product';
@@ -307,8 +307,8 @@ public function testSave(): void
     }
 
     /**
-    * @return void
-    */
+     * @return void
+     */
     public function testSaveWhenOptionTypeWasChanged(): void
     {
         $productSku = 'simple_product';

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
@@ -68,6 +68,9 @@ class PriceTest extends TestCase
      */
     protected $websiteMock;
 
+    /**
+     * @var ProductTierPriceExtensionFactory|MockObject
+     */
     private $tierPriceExtensionFactoryMock;
 
     /**

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php
@@ -137,6 +137,7 @@ public function testGetCompositeTypes(): void
     public function testGetTypesByPriority(): void
     {
         $expected = [];
+        $options = [];
         foreach ($this->_productTypes as $typeId => $type) {
             $type['label'] = __($type['label']);
             $options[$typeId] = $type;
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,6 +68,9 @@ class PriceTest extends TestCase @@
          */
         protected $websiteMock;
+        /**
+         * @var ProductTierPriceExtensionFactory|MockObject
+         */
         private $tierPriceExtensionFactoryMock;
         /**
@@ Expand Down @@