AC-15048::[CE] PHPUnit 12: Upgrade Search & Navigation related test cases | Static Test Fixes

cod43156 · cod43156 · commit a284ec1d7fc2 · 2025-11-07T20:48:03.000+05:30
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php b/app/code/Magento/Elasticsearch/Test/Unit/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2023 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2018 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -14,7 +14,6 @@
 use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Elasticsearch\Model\Client\Elasticsearch;
 use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
@@ -154,7 +153,7 @@ protected function setUp(): void
         $elasticsearchClientMock->expects($this->any())
             ->method('indices')
             ->willReturn($indicesMock);
-        $this->client = $this->createMock(Elasticsearch::class); // @phpstan-ignore-line
+        $this->client = $this->createMock(ElasticsearchClient::class);
         $this->connectionManager->expects($this->any())
             ->method('getConnection')
             ->willReturn($this->client);
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
@@ -130,6 +130,8 @@ protected function setUp(): void
      * @param string $sortFieldName
      * @param array $expected
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     #[DataProvider('attributeProvider')]
     public function testGetAllAttributesTypes(
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/Config/EsConfigTest.php
@@ -77,18 +77,20 @@ protected function setUp(): void
     }
 
     /**
-     * @return array|mixed|null
+     * Test getStemmerInfo method
      */
-    public function testGetStemmerInfo()
+    public function testGetStemmerInfo(): void
     {
-        $this->config->getStemmerInfo();
+        $result = $this->config->getStemmerInfo();
+        $this->assertIsArray($result);
     }
 
     /**
-     * @return array|mixed|null
+     * Test getStopwordsInfo method
      */
-    public function testGetStopwordsInfo()
+    public function testGetStopwordsInfo(): void
     {
-        $this->config->getStopwordsInfo();
+        $result = $this->config->getStopwordsInfo();
+        $this->assertIsArray($result);
     }
 }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/DocumentFactoryTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/DocumentFactoryTest.php
@@ -39,7 +39,7 @@ class DocumentFactoryTest extends TestCase
     protected $entityMetadata;
 
     /**
-     * Instance name
+     * Fully qualified class name of the entity
      *
      * @var string
      */
diff --git a/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php b/app/code/Magento/LayeredNavigation/Test/Unit/Block/NavigationTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2018 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/LayeredNavigation/Test/Unit/Observer/Edit/Tab/Front/ProductAttributeFormBuildFormFieldDependenciesObserverTest.php b/app/code/Magento/LayeredNavigation/Test/Unit/Observer/Edit/Tab/Front/ProductAttributeFormBuildFormFieldDependenciesObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2023 Adobe
  * All Rights Reserved.
  */
 
diff --git a/app/code/Magento/LayeredNavigation/Test/Unit/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserverTest.php b/app/code/Magento/LayeredNavigation/Test/Unit/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 
diff --git a/app/code/Magento/LayeredNavigation/Test/Unit/Observer/Grid/ProductAttributeGridBuildObserverTest.php b/app/code/Magento/LayeredNavigation/Test/Unit/Observer/Grid/ProductAttributeGridBuildObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2019 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/SaveTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Search/Test/Unit/Model/QueryFactoryTest.php b/app/code/Magento/Search/Test/Unit/Model/QueryFactoryTest.php
@@ -362,6 +362,7 @@ function ($arg1, $arg2) {
      * @param bool $isQueryTextShort
      * @param string $matchedQueryText
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     private function mockSimpleQuery(
         string $cleanedRawText,
diff --git a/app/code/Magento/Search/Test/Unit/Model/ResourceModel/SynonymGroupTest.php b/app/code/Magento/Search/Test/Unit/Model/ResourceModel/SynonymGroupTest.php
@@ -21,12 +21,7 @@ public function testGetByScope()
     {
         $context = $this->createMock(Context::class);
         $resources = $this->createMock(ResourceConnection::class);
-        $connection = $this->createMock(
-            AdapterInterface::class,
-            [],
-            '',
-            false
-        );
+        $connection = $this->createMock(AdapterInterface::class);
         $select = $this->createMock(Select::class);
 
         $connection->expects($this->exactly(2))->method('quoteIdentifier')->willReturn('quoted');
diff --git a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php
@@ -18,10 +18,19 @@
  */
 class ValidatorTest extends TestCase
 {
+    /**
+     * @var Validator
+     */
     private $validator;
 
+    /**
+     * @var MockObject
+     */
     private $otherEngineValidatorMock;
 
+    /**
+     * @var MockObject
+     */
     private $scopeConfigMock;
 
     protected function setUp(): void
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatchTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatchTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
@@ -130,7 +130,7 @@ public function testGetStoreOptionValuesWithCachedData(): void
             14 => 'Blue',
             15 => 'Black'
         ];
-        
+
         $this->block->expects($this->once())
             ->method('getData')
             ->with('store_option_values_1')
@@ -169,7 +169,7 @@ public function testGetStoreOptionValuesWithNullData(): void
                 'getSelect'
             ]
         );
-        
+
         $attrOptionCollectionMock->method('getIterator')->willReturn(new \ArrayIterator([$option]));
 
         $this->attrOptionCollectionFactoryMock
@@ -196,15 +196,15 @@ public function testGetStoreOptionValuesWithNullData(): void
             ->expects($this->once())
             ->method('getConnection')
             ->willReturn($this->connectionMock);
-        
+
         $attrOptionCollectionMock
             ->expects($this->atLeastOnce())
             ->method('getTable')
             ->willReturnMap([
                 ['eav_attribute_option_value', 'eav_attribute_option_value'],
                 ['eav_attribute_option_swatch', 'eav_attribute_option_swatch']
             ]);
-        
+
         $attrOptionCollectionMock
             ->expects($this->once())
             ->method('load')
@@ -220,7 +220,7 @@ public function testGetStoreOptionValuesWithNullData(): void
                 14 => '#0000FF'
             ]
         ];
-        
+
         $result = $this->block->getStoreOptionValues(1);
         $this->assertEquals($expectedValues, $result);
     }
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/TextTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/TextTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2019 Adobe
  * All Rights Reserved.
  */
 
@@ -89,7 +89,7 @@ public function executeTest($testCase)
     {
         // Set read_only property directly
         $this->model->read_only = $testCase['dataSet']['read_only'];
-        
+
         // Override methods for this test
         $dataSet = $testCase['dataSet'];
         $this->model = $this->createPartialMockWithReflection(
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/VisualTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Attribute/Edit/Options/VisualTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2019 Adobe
  * All Rights Reserved.
  */
 
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/LayeredNavigation/RenderLayeredTest.php b/app/code/Magento/Swatches/Test/Unit/Block/LayeredNavigation/RenderLayeredTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2016 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2018 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/MediaTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/AttributesListTest.php b/app/code/Magento/Swatches/Test/Unit/Model/AttributesListTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
@@ -55,7 +55,7 @@ protected function setUp(): void
 
         $sourceMock = $this->createPartialMockWithReflection(\stdClass::class, ['getAllOptions']);
         $sourceMock->method('getAllOptions')->willReturn(['options']);
-        
+
         $this->attributeMock = $this->createPartialMockWithReflection(
             Attribute::class,
             ['getId', 'getFrontendLabel', 'getAttributeCode', 'getSource']
@@ -64,7 +64,7 @@ protected function setUp(): void
         $this->attributeMock->method('getFrontendLabel')->willReturn('label');
         $this->attributeMock->method('getAttributeCode')->willReturn('code');
         $this->attributeMock->method('getSource')->willReturn($sourceMock);
-        
+
         $this->collectionMock
             ->expects($this->once())
             ->method('getItems')
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Form/Element/AbstractSwatchTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Form/Element/AbstractSwatchTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2016 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/EavAttributeTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/FilterRendererTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/FilterRendererTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ProductImageTest.php
@@ -159,7 +159,8 @@ protected function canReplaceImageWithSwatch($expected)
         }
     }
 
-    protected function getMockForProductClass() {
+    protected function getMockForProductClass()
+    {
         $productMock = $this->createMock(Product::class);
         $productMock->expects($this->any())->method('getImage')->willReturn(false);
         return $productMock;
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributesProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2017 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddSwatchAttributeTypeObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2015 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
@@ -59,10 +59,10 @@ public function testAddSwatchAttributeType($exp)
 
         $response = $this->createPartialMockWithReflection(DataObject::class, ['getTypes', 'setTypes']);
         $response->method('getTypes')->willReturn($exp['outputArray']);
-        
+
         $eventMock = $this->createPartialMockWithReflection(Event::class, ['getResponse']);
         $eventMock->method('getResponse')->willReturn($response);
-        
+
         $this->eventObserverMock->method('getEvent')->willReturn($eventMock);
 
         $this->observerMock->execute($this->eventObserverMock);
diff --git a/app/code/Magento/Swatches/Test/Unit/Plugin/Catalog/CacheInvalidateTest.php b/app/code/Magento/Swatches/Test/Unit/Plugin/Catalog/CacheInvalidateTest.php
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/MockCreationTrait.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/MockCreationTrait.php

Original file line number	Diff line number	Diff line change
`@@ -77,18 +77,20 @@ protected function setUp(): void`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
`80`		`- * @return array\|mixed\|null`
	`80`	`+ * Test getStemmerInfo method`
`81`	`81`	`*/`
`82`		`- public function testGetStemmerInfo()`
	`82`	`+ public function testGetStemmerInfo(): void`
`83`	`83`	`{`
`84`		`- $this->config->getStemmerInfo();`
	`84`	`+ $result = $this->config->getStemmerInfo();`
	`85`	`+ $this->assertIsArray($result);`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`/**`
`88`		`- * @return array\|mixed\|null`
	`89`	`+ * Test getStopwordsInfo method`
`89`	`90`	`*/`
`90`		`- public function testGetStopwordsInfo()`
	`91`	`+ public function testGetStopwordsInfo(): void`
`91`	`92`	`{`
`92`		`- $this->config->getStopwordsInfo();`
	`93`	`+ $result = $this->config->getStopwordsInfo();`
	`94`	`+ $this->assertIsArray($result);`
`93`	`95`	`}`
`94`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class DocumentFactoryTest extends TestCase`
`39`	`39`	`protected $entityMetadata;`
`40`	`40`
`41`	`41`	`/**`
`42`		`- * Instance name`
	`42`	`+ * Fully qualified class name of the entity`
`43`	`43`	`*`
`44`	`44`	`* @var string`
`45`	`45`	`*/`