Merge remote-tracking branch 'origin/AC-7821' into Hammer_Regression_issues_07Feb23

Author: glo71317

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\ClientBuilder::class)) {
+        if (!class_exists(\Elasticsearch\Client::class)) {
             $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
         }
 

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -3,7 +3,7 @@
  * See COPYING.txt for license details.
  */
 
-define([
+ define([
     'jquery',
     'Magento_Ui/js/modal/confirm',
     'Magento_Ui/js/modal/alert',
@@ -158,6 +158,7 @@ define([
             //this.loadArea(['header', 'sidebar','data'], true);
             this.dataShow();
             this.loadArea(['header', 'data'], true);
+            location.reload();
         },
 
         setCurrencyId: function (id) {

composer.json

@@ -38,7 +38,7 @@
         "colinmollenhour/credis": "^1.13",
         "colinmollenhour/php-redis-session-abstract": "^1.5",
         "composer/composer": "^2.0, !=2.2.16",
-        "elasticsearch/elasticsearch": "^7.17",
+        "elasticsearch/elasticsearch": "^7.17||^8.5",
         "ezyang/htmlpurifier": "^4.16",
         "guzzlehttp/guzzle": "^7.5",
         "laminas/laminas-captcha": "^2.12",

dev/tests/integration/testsuite/Magento/Elasticsearch7/SearchAdapter/ConnectionManagerTest.php

@@ -43,6 +43,10 @@ protected function setUp(): void
      */
     public function testCorrectElasticsearchClientEs7()
     {
+        if (!class_exists(\Elasticsearch\Client::class)) {
+            $this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
+        }
+
         $connection = $this->connectionManager->getConnection();
         $this->assertInstanceOf(Elasticsearch::class, $connection);
     }

dev/tests/static/testsuite/Magento/Test/Integrity/_files/extension_dependencies_test/allowed_dependencies/ce.php

@@ -8,7 +8,6 @@
 return [
     'Magento\Elasticsearch' => [
         'Magento\Elasticsearch7',
-        'Magento\Elasticsearch8',
         'Magento\OpenSearch'
     ]
 ];