Merge branch '2.4-develop' into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/AdvancedSearch/Helper/Data.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Helper;
+
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\App\Helper\AbstractHelper;
+use OpenSearch\Client;
+
+class Data extends AbstractHelper
+{
+
+    public const OPENSEARCH = 'opensearch';
+    public const MAJOR_VERSION = '2';
+
+    /**
+     * @var EngineResolverInterface
+     */
+    public $engineResolver;
+
+    /**
+     * @param Context $context
+     * @param EngineResolverInterface $engineResolver
+     */
+    public function __construct(
+        Context $context,
+        EngineResolverInterface $engineResolver
+    ) {
+        parent::__construct($context);
+        $this->engineResolver = $engineResolver;
+    }
+
+    /**
+     * Check if opensearch v2.x
+     *
+     * @return bool
+     */
+    public function isClientOpenSearchV2(): bool
+    {
+        $searchEngine =  $this->engineResolver->getCurrentSearchEngine();
+        if (stripos($searchEngine, self::OPENSEARCH) !== false) {
+            if (substr(Client::VERSION, 0, 1) == self::MAJOR_VERSION) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

app/code/Magento/AdvancedSearch/Model/Client/ClientFactory.php

@@ -6,11 +6,12 @@
 namespace Magento\AdvancedSearch\Model\Client;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\AdvancedSearch\Helper\Data;
 
 class ClientFactory implements ClientFactoryInterface
 {
     /**
-     * Object manager
+     * Object var
      *
      * @var ObjectManagerInterface
      */
@@ -21,14 +22,32 @@ class ClientFactory implements ClientFactoryInterface
      */
     private $clientClass;
 
+    /**
+     * @var string
+     */
+    private $openSearch;
+
+    /**
+     * @var Data
+     */
+    protected $helper;
+
     /**
      * @param ObjectManagerInterface $objectManager
      * @param string $clientClass
+     * @param Data $helper
+     * @param string|null $openSearch
      */
-    public function __construct(ObjectManagerInterface $objectManager, $clientClass)
-    {
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        $clientClass,
+        Data $helper,
+        $openSearch = null
+    ) {
         $this->objectManager = $objectManager;
         $this->clientClass = $clientClass;
+        $this->openSearch = $openSearch;
+        $this->helper = $helper;
     }
 
     /**
@@ -39,8 +58,13 @@ public function __construct(ObjectManagerInterface $objectManager, $clientClass)
      */
     public function create(array $options = [])
     {
+        $class = $this->clientClass;
+        if ($this->helper->isClientOpenSearchV2()) {
+            $class = $this->openSearch;
+        }
+
         return $this->objectManager->create(
-            $this->clientClass,
+            $class,
             ['options' => $options]
         );
     }

app/code/Magento/AdvancedSearch/Test/Unit/Helper/DataTest.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AdvancedSearch\Test\Unit\Helper;
+
+use Magento\AdvancedSearch\Helper\Data;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\Search\EngineResolverInterface;
+
+/**
+ * @covers \Magento\AdvancedSearch\Helper\Data
+ */
+class DataTest extends TestCase
+{
+
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var EngineResolverInterface|MockObject
+     */
+    private $engineResolverMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->engineResolverMock = $this->getMockForAbstractClass(EngineResolverInterface::class);
+
+        $this->engineResolverMock->expects($this->any())
+            ->method('getCurrentSearchEngine')
+            ->willReturn('');
+
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->helper = $this->objectManager->getObject(
+            Data::class,
+            [
+                'context' => $this->contextMock,
+                'engineResolver' => $this->engineResolverMock
+            ]
+        );
+    }
+
+    public function testIsClientOpenSearchV2()
+    {
+        $this->assertIsBool($this->helper->isClientOpenSearchV2());
+    }
+}

app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertMiniCartEmptyActionGroup.xml

@@ -16,6 +16,6 @@
         <wait stepKey="waitForMinicartAjaxCallToComplete" time="15"/>
         <dontSeeElement selector="{{StorefrontMinicartSection.productCount}}" stepKey="dontSeeMinicartProductCount"/>
         <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="expandMinicart"/>
-        <see selector="{{StorefrontMinicartSection.minicartContent}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
+        <see selector="{{StorefrontMinicartSection.messageEmptyCart}}" userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php

@@ -19,9 +19,11 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Stdlib\ArrayManager;
 use Psr\Log\LoggerInterface;
+use Magento\AdvancedSearch\Helper\Data;
 
 /**
  * Elasticsearch adapter
+ * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Elasticsearch
@@ -110,6 +112,11 @@ class Elasticsearch
      */
     private $arrayManager;
 
+    /**
+     * @var Data
+     */
+    protected $helper;
+
     /**
      * @var array
      */
@@ -125,6 +132,7 @@ class Elasticsearch
      * @param LoggerInterface $logger
      * @param Index\IndexNameResolver $indexNameResolver
      * @param BatchDataMapperInterface $batchDocumentDataMapper
+     * @param Data $helper
      * @param array $options
      * @param ProductAttributeRepositoryInterface|null $productAttributeRepository
      * @param StaticField|null $staticFieldProvider
@@ -141,6 +149,7 @@ public function __construct(
         LoggerInterface $logger,
         IndexNameResolver $indexNameResolver,
         BatchDataMapperInterface $batchDocumentDataMapper,
+        Data $helper,
         $options = [],
         ProductAttributeRepositoryInterface $productAttributeRepository = null,
         StaticField $staticFieldProvider = null,
@@ -154,6 +163,7 @@ public function __construct(
         $this->logger = $logger;
         $this->indexNameResolver = $indexNameResolver;
         $this->batchDocumentDataMapper = $batchDocumentDataMapper;
+        $this->helper = $helper;
         $this->productAttributeRepository = $productAttributeRepository ?:
             ObjectManager::getInstance()->get(ProductAttributeRepositoryInterface::class);
         $this->staticFieldProvider = $staticFieldProvider ?:
@@ -329,18 +339,30 @@ protected function getDocsArrayInBulkIndexFormat(
         ];
 
         foreach ($documents as $id => $document) {
-            $bulkArray['body'][] = [
-                $action => [
-                    '_id' => $id,
-                    '_type' => $this->clientConfig->getEntityType(),
-                    '_index' => $indexName
-                ]
-            ];
+            if ($this->helper->isClientOpenSearchV2()) {
+                $bulkArray['body'][] = [
+                    $action => [
+                        '_id' => $id,
+                        '_index' => $indexName
+                    ]
+                ];
+            } else {
+                $bulkArray['body'][] = [
+                    $action => [
+                        '_id' => $id,
+                        '_type' => $this->clientConfig->getEntityType(),
+                        '_index' => $indexName
+                    ]
+                ];
+            }
             if ($action == self::BULK_ACTION_INDEX) {
                 $bulkArray['body'][] = $document;
             }
         }
 
+        if ($this->helper->isClientOpenSearchV2()) {
+            unset($bulkArray['type']);
+        }
         return $bulkArray;
     }
 

app/code/Magento/Elasticsearch7/composer.json

@@ -5,7 +5,7 @@
         "php": "~8.1.0||~8.2.0",
         "magento/framework": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~7.17.0",
+        "elasticsearch/elasticsearch": "^7.17",
         "magento/module-advanced-search": "*",
         "magento/module-catalog-search": "*",
         "magento/module-search": "*"

app/code/Magento/GraphQl/composer.json

@@ -9,7 +9,7 @@
         "magento/module-webapi": "*",
         "magento/module-new-relic-reporting": "*",
         "magento/module-authorization": "*",
-        "webonyx/graphql-php": "~14.11.5"
+        "webonyx/graphql-php": "^14.11"
     },
     "suggest": {
         "magento/module-graph-ql-cache": "*"

app/code/Magento/OpenSearch/Model/OpenSearch.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\OpenSearch\Model;
+
+/**
+ * The purpose of this class is adding the support for opensearch version 2
+ */
+
+class OpenSearch extends SearchClient
+{
+
+    /**
+     * Add mapping to OpenSearch index
+     *
+     * @param array $fields
+     * @param string $index
+     * @param string $entityType
+     * @return void
+     */
+    public function addFieldsMapping(array $fields, string $index, string $entityType)
+    {
+        $params = [
+            'index' => $index,
+            'body' => [
+                'properties' => [],
+                'dynamic_templates' => $this->dynamicTemplatesProvider->getTemplates(),
+            ],
+        ];
+
+        foreach ($this->applyFieldsMappingPreprocessors($fields) as $field => $fieldInfo) {
+            $params['body']['properties'][$field] = $fieldInfo;
+        }
+
+        $this->getOpenSearchClient()->indices()->putMapping($params);
+    }
+
+    /**
+     * Execute search by $query
+     *
+     * @param array $query
+     * @return array
+     */
+    public function query(array $query): array
+    {
+        unset($query['type']);
+        return $this->getOpenSearchClient()->search($query);
+    }
+}

app/code/Magento/OpenSearch/Model/SearchClient.php

@@ -42,7 +42,7 @@ class SearchClient implements ClientInterface
     /**
      * @var DynamicTemplatesProvider|null
      */
-    private $dynamicTemplatesProvider;
+    public $dynamicTemplatesProvider;
 
     /**
      * Initialize Client
@@ -93,7 +93,7 @@ public function suggest(array $query): array
      *
      * @return Client
      */
-    private function getOpenSearchClient(): Client
+    public function getOpenSearchClient(): Client
     {
         $pid = getmypid();
         if (!isset($this->client[$pid])) {
@@ -371,7 +371,7 @@ public function deleteMapping(string $index, string $entityType)
      * @param array $properties
      * @return array
      */
-    private function applyFieldsMappingPreprocessors(array $properties): array
+    public function applyFieldsMappingPreprocessors(array $properties): array
     {
         foreach ($this->fieldsMappingPreprocessors as $preprocessor) {
             $properties = $preprocessor->process($properties);