Skip to content

Commit 51f38b4

Browse files
authored
Merge pull request #8127 from magento-gl/Hammer_Regression_issues_07Feb23
Hammer regression issues 07 feb23
2 parents 5bce71f + 7fe6af8 commit 51f38b4

File tree

35 files changed

+24
-2384
lines changed

35 files changed

+24
-2384
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class ElasticsearchTest extends TestCase
111111
*/
112112
protected function setUp(): void
113113
{
114-
if (!class_exists(\Elasticsearch\Client::class)) {
114+
if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
115115
$this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
116116
}
117117

app/code/Magento/Elasticsearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/module-store": "*",
1313
"magento/module-catalog-inventory": "*",
1414
"magento/framework": "*",
15-
"elasticsearch/elasticsearch": "~7.17.0"
15+
"elasticsearch/elasticsearch": "~7.17.0 || ~8.5.0"
1616
},
1717
"suggest": {
1818
"magento/module-config": "*"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public function testGetItemsWithEnabledSearchSuggestion(): void
226226
*/
227227
public function testGetItemsException(): void
228228
{
229-
if (!class_exists(\Elasticsearch\Client::class)) {
229+
if (!class_exists(\Elasticsearch\ClientBuilder::class)) { /** @phpstan-ignore-line */
230230
$this->markTestSkipped('AC-6597: Skipped as Elasticsearch 8 is configured');
231231
}
232232

app/code/Magento/Elasticsearch8/Block/Adminhtml/System/Config/TestConnection.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

app/code/Magento/Elasticsearch8/LICENSE.txt

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)