Merge remote-tracking branch 'origin/Arrows-AC-15048' into AC-15049-Security_Authentication

Author: manishranjan-adobe

app/code/Magento/Elasticsearch/Test/Unit/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolverTest.php

@@ -16,6 +16,7 @@
     as FieldTypeResolver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -49,18 +50,9 @@ class IndexResolverTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->converter = $this->getMockBuilder(ConverterInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['convert'])
-            ->getMockForAbstractClass();
-        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['convert'])
-            ->getMockForAbstractClass();
-        $this->fieldTypeResolver = $this->getMockBuilder(FieldTypeResolver::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getFieldType'])
-            ->getMockForAbstractClass();
+        $this->converter = $this->createPartialMock(ConverterInterface::class, ['convert']);
+        $this->fieldTypeConverter = $this->createPartialMock(FieldTypeConverterInterface::class, ['convert']);
+        $this->fieldTypeResolver = $this->createPartialMock(FieldTypeResolver::class, ['getFieldType']);
         $objectManager = new ObjectManagerHelper($this);
 
         $this->resolver = $objectManager->getObject(
@@ -74,7 +66,6 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider getFieldIndexProvider
      * @param $isSearchable
      * @param $isAlwaysIndexable
      * @param $isComplexType
@@ -86,6 +77,7 @@ protected function setUp(): void
      * @param $expected
      * @return void
      */
+    #[DataProvider('getFieldIndexProvider')]
     public function testGetFieldName(
         $isSearchable,
         $isAlwaysIndexable,

app/code/Magento/Elasticsearch/Test/Unit/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/IntegerTypeTest.php

@@ -14,6 +14,7 @@
     as FieldTypeConverterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -37,10 +38,7 @@ class IntegerTypeTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['convert'])
-            ->getMockForAbstractClass();
+        $this->fieldTypeConverter = $this->createPartialMock(FieldTypeConverterInterface::class, ['convert']);
 
         $objectManager = new ObjectManagerHelper($this);
 
@@ -53,13 +51,13 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider getFieldTypeProvider
      * @param string $attributeCode
      * @param bool $isIntegerType
      * @param bool $isBooleanType
      * @param string $expected
      * @return void
      */
+    #[DataProvider('getFieldTypeProvider')]
     public function testGetFieldType(
         string $attributeCode,
         bool $isIntegerType,

app/code/Magento/Elasticsearch/Test/Unit/ElasticAdapter/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Resolver/KeywordTypeTest.php

@@ -14,6 +14,7 @@
     as FieldTypeConverterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -37,10 +38,7 @@ class KeywordTypeTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->fieldTypeConverter = $this->getMockBuilder(FieldTypeConverterInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['convert'])
-            ->getMockForAbstractClass();
+        $this->fieldTypeConverter = $this->createPartialMock(FieldTypeConverterInterface::class, ['convert']);
 
         $objectManager = new ObjectManagerHelper($this);
 
@@ -53,7 +51,6 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider getFieldTypeProvider
      * @param bool $isComplexType
      * @param bool $isSearchable
      * @param bool $isAlwaysIndexable
@@ -62,6 +59,7 @@ protected function setUp(): void
      * @param string $expected
      * @return void
      */
+    #[DataProvider('getFieldTypeProvider')]
     public function testGetFieldType(
         bool $isComplexType,
         bool $isSearchable,

app/code/Magento/Elasticsearch/Test/Unit/ElasticAdapter/SearchAdapter/Query/BuilderTest.php

@@ -90,21 +90,9 @@ protected function setUp(): void
             ->onlyMethods(['build'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->request = $this->getMockBuilder(RequestInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->scopeResolver = $this->getMockForAbstractClass(
-            ScopeResolverInterface::class,
-            [],
-            '',
-            false
-        );
-        $this->scopeInterface = $this->getMockForAbstractClass(
-            ScopeInterface::class,
-            [],
-            '',
-            false
-        );
+        $this->request = $this->createMock(RequestInterface::class);
+        $this->scopeResolver = $this->createMock(ScopeResolverInterface::class);
+        $this->scopeInterface = $this->createMock(ScopeInterface::class);
 
         $this->model = new Builder(
             $this->clientConfig,

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperFactoryTest.php

@@ -40,9 +40,7 @@ class DataMapperFactoryTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         $this->dataMappers = [
             'product' => 'productDataMapper',
         ];
@@ -96,7 +94,7 @@ public function testCreate()
     {
         $this->objectManagerMock->expects($this->once())
             ->method('create')
-            ->willReturn($this->getMockForAbstractClass(BatchDataMapperInterface::class));
+            ->willReturn($this->createMock(BatchDataMapperInterface::class));
         $this->assertInstanceOf(BatchDataMapperInterface::class, $this->model->create('product'));
     }
 }

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/DataMapperResolverTest.php

@@ -39,9 +39,7 @@ protected function setUp(): void
         $this->dataMapperFactoryMock = $this->getMockBuilder(DataMapperFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->dataMapperEntity = $this->getMockBuilder(BatchDataMapperInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->dataMapperEntity = $this->createMock(BatchDataMapperInterface::class);
         $this->model = (new ObjectManagerHelper($this))->getObject(
             DataMapperResolver::class,
             [

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php

@@ -19,6 +19,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider as DataProviderAttribute;
 
 /**
  * Unit tests for \Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper class.
@@ -67,19 +68,20 @@ class ProductDataMapperTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->builderMock = $this->createTestProxy(Builder::class);
-        $this->fieldMapperMock = $this->getMockForAbstractClass(FieldMapperInterface::class);
+        $objectManager = new ObjectManagerHelper($this);
+        $this->builderMock = $objectManager->getObject(Builder::class);
+        
+        $this->fieldMapperMock = $this->createMock(FieldMapperInterface::class);
         $this->dataProvider = $this->createMock(DataProvider::class);
         $this->attribute = $this->createMock(Attribute::class);
-        $this->additionalFieldsProvider = $this->getMockForAbstractClass(AdditionalFieldsProviderInterface::class);
+        $this->additionalFieldsProvider = $this->createMock(AdditionalFieldsProviderInterface::class);
         $this->dateFieldTypeMock = $this->createMock(Date::class);
         $filterableAttributeTypes = [
             'boolean' => 'boolean',
             'multiselect' => 'multiselect',
             'select' => 'select',
         ];
 
-        $objectManager = new ObjectManagerHelper($this);
         $this->model = $objectManager->getObject(
             ProductDataMapper::class,
             [
@@ -101,19 +103,7 @@ public function testGetMapAdditionalFieldsOnly()
         $storeId = 1;
         $productId = 42;
         $additionalFields = ['some data'];
-        $this->builderMock->expects($this->once())
-            ->method('addField')
-            ->with('store_id', $storeId);
-
-        $this->builderMock->expects($this->any())
-            ->method('addFields')
-            ->willReturnCallback(fn($param) => match ([$param]) {
-                [$additionalFields] => $this->builderMock,
-            });
 
-        $this->builderMock->expects($this->any())
-            ->method('build')
-            ->willReturn([]);
         $this->additionalFieldsProvider->expects($this->once())
             ->method('getFields')
             ->with([$productId], $storeId)
@@ -130,8 +120,6 @@ public function testGetMapEmptyData()
     {
         $storeId = 1;
 
-        $this->builderMock->expects($this->never())->method('addField');
-        $this->builderMock->expects($this->never())->method('build');
         $this->additionalFieldsProvider->expects($this->once())
             ->method('getFields')
             ->with([], $storeId)
@@ -146,8 +134,8 @@ public function testGetMapEmptyData()
      * @param array $attributeData
      * @param array|string $attributeValue
      * @param array $returnAttributeData
-     * @dataProvider mapProvider
      */
+    #[DataProviderAttribute('mapProvider')]
     public function testGetMap(int $productId, array $attributeData, $attributeValue, array $returnAttributeData)
     {
         $storeId = 1;
@@ -175,7 +163,6 @@ public function testGetMap(int $productId, array $attributeData, $attributeValue
 
     /**
      * @return void
-     */
     public function testGetMapWithOptions()
     {
         $storeId = 1;
@@ -223,7 +210,7 @@ private function getAttribute(array $attributeData): MockObject
         $sourceMock->method('getAllOptions')->willReturn($attributeData['options'] ?? []);
         $options = [];
         foreach ($attributeData['options'] as $option) {
-            $optionMock = $this->getMockForAbstractClass(AttributeOptionInterface::class);
+            $optionMock = $this->createMock(AttributeOptionInterface::class);
             $optionMock->method('getValue')->willReturn($option['value']);
             $optionMock->method('getLabel')->willReturn($option['label']);
             $options[] = $optionMock;

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php

@@ -9,12 +9,13 @@
 
 use Elasticsearch\Client;
 use Elasticsearch\Namespaces\IndicesNamespace;
+use Elasticsearch\ClientBuilder;
 use Exception;
 use Magento\AdvancedSearch\Model\Client\ClientInterface as ElasticsearchClient;
 use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\Elasticsearch8\Model\Client\Elasticsearch;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Elasticsearch7\Model\Client\Elasticsearch;
 use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
@@ -76,7 +77,7 @@ class ElasticsearchTest extends TestCase
     protected $logger;
 
     /**
-     * @var ElasticsearchClient|MockObject
+     * @var Elasticsearch|MockObject
      */
     protected $client;
 
@@ -111,7 +112,7 @@ class ElasticsearchTest extends TestCase
      */
     protected function setUp(): void
     {
-        if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
+        if (!class_exists(ClientBuilder::class)) {
             $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
         }
 
@@ -122,21 +123,21 @@ protected function setUp(): void
             ->getMock();
         $this->fieldMapper = $this->getMockBuilder(FieldMapperInterface::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
         $this->clientConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['getIndexPrefix', 'getEntityType'])->getMock();
         $this->indexBuilder = $this->getMockBuilder(BuilderInterface::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
         $this->logger = $this->getMockBuilder(LoggerInterface::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $elasticsearchClientMock = $this->getMockBuilder(Client::class)
+            ->getMock();
+        $elasticsearchClientMock = $this->getMockBuilder(Client::class) // @phpstan-ignore-line
             ->onlyMethods(['indices', 'ping', 'bulk', 'search'])
             ->disableOriginalConstructor()
             ->getMock();
-        $indicesMock = $this->getMockBuilder(IndicesNamespace::class)
+        $indicesMock = $this->getMockBuilder(IndicesNamespace::class) // @phpstan-ignore-line
             ->onlyMethods(
                 [
                     'exists',
@@ -198,10 +199,10 @@ protected function setUp(): void
             ->getMock();
         $this->batchDocumentDataMapper = $this->getMockBuilder(BatchDataMapperInterface::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
         $this->productAttributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
         $this->staticFieldProvider = $this->getMockBuilder(StaticField::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -629,7 +630,7 @@ public function testUpdateIndexMappingWithAliasDefinition(): void
 
         $attribute = $this->getMockBuilder(AbstractAttribute::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
 
         $this->productAttributeRepository->expects($this->once())
             ->method('get')

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/AddDefaultSearchFieldTest.php

@@ -10,6 +10,7 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\AddDefaultSearchField;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Test mapping preprocessor AddDefaultSearchField
@@ -19,10 +20,10 @@ class AddDefaultSearchFieldTest extends TestCase
     /**
      * Test default search field "_search" should be prepended and overwrite if exist.
      *
-     * @dataProvider processDataProvider
      * @param array $mappingBefore
      * @param array $mappingAfter
      */
+    #[DataProvider('processDataProvider')]
     public function testProcess(array $mappingBefore, array $mappingAfter)
     {
         $objectManager = new ObjectManager($this);

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/CopySearchableFieldsToSearchFieldTest.php

@@ -10,6 +10,7 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\CopySearchableFieldsToSearchField;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * Test mapping preprocessor CopySearchableFieldsToSearchField
@@ -19,10 +20,10 @@ class CopySearchableFieldsToSearchFieldTest extends TestCase
     /**
      * Test "copy_to" parameter should be added to searchable fields.
      *
-     * @dataProvider processDataProvider
      * @param array $mappingBefore
      * @param array $mappingAfter
      */
+    #[DataProvider('processDataProvider')]
     public function testProcess(array $mappingBefore, array $mappingAfter)
     {
         $objectManager = new ObjectManager($this);