AC-13818::Make ES8 to be default for 2.4.8 instead of ES7

glo71317 · glo71317 · commit 04b9d679ea13 · 2025-02-03T15:35:12.000+05:30
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "magento/elasticsearch": "^1.0.0"
+        "elasticsearch/elasticsearch": "^8.15"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch8/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch8/Model/Client/Elasticsearch.php
@@ -19,6 +19,7 @@
  * Elasticsearch client
  * @deprecated Elasticsearch8 is no longer supported by Adobe
  * @see this class will be responsible for ES8 only
+ * phpstan:ignore "File has calls static method. (phpStaticMethodCalls)"
  */
 class Elasticsearch implements ClientInterface
 {
diff --git a/app/code/Magento/Elasticsearch8/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch8/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -27,6 +27,7 @@
  * Class ElasticsearchTest to test Elasticsearch 8
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * phpstan:ignore "File has calls static method. (phpStaticMethodCalls)"
  */
 class ElasticsearchTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`* Elasticsearch client`
`20`	`20`	`* @deprecated Elasticsearch8 is no longer supported by Adobe`
`21`	`21`	`* @see this class will be responsible for ES8 only`
	`22`	`+ * phpstan:ignore "File has calls static method. (phpStaticMethodCalls)"`
`22`	`23`	`*/`
`23`	`24`	`class Elasticsearch implements ClientInterface`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`* Class ElasticsearchTest to test Elasticsearch 8`
`28`	`28`	`*`
`29`	`29`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`30`	`+ * phpstan:ignore "File has calls static method. (phpStaticMethodCalls)"`
`30`	`31`	`*/`
`31`	`32`	`class ElasticsearchTest extends TestCase`
`32`	`33`	`{`