Fix phpcs issues that were false-positive

magento · Oct 15, 2021 · 6950895 · 6950895
1 parent 7cac36c
commit 6950895
Show file tree

Hide file tree

Showing 126 changed files with 724 additions and 765 deletions.
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/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/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 @@