Merge remote-tracking branch 'origin/2.4.6-develop' into ACQE-4573

Author: KevinBKozan

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

@@ -111,7 +111,7 @@ class ElasticsearchTest extends TestCase
      */
     protected function setUp(): void
     {
-        if (!class_exists(\Elasticsearch\Client::class)) {
+        if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
             $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
         }
 

app/code/Magento/Elasticsearch/composer.json

@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~7.17.0"
+        "elasticsearch/elasticsearch": "~7.17.0 || ~8.5.0"
     },
     "suggest": {
         "magento/module-config": "*"

app/code/Magento/Elasticsearch7/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php

@@ -226,7 +226,7 @@ public function testGetItemsWithEnabledSearchSuggestion(): void
      */
     public function testGetItemsException(): void
     {
-        if (!class_exists(\Elasticsearch\Client::class)) {
+        if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
             $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
         }