Skip to content

Commit 3f2e4a0

Browse files
committed
AC-6714: Fixed static and unit test failures
1 parent fbeb5d7 commit 3f2e4a0

File tree

8 files changed

+15
-7
lines changed

8 files changed

+15
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Elasticsearch8\Model\Adapter;
89

app/code/Magento/Elasticsearch8/Model/Client/Elasticsearch.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ public function getAlias(string $alias): array
292292
* @param string $index
293293
* @param string $entityType
294294
* @return void
295+
* @SuppressWarnings("unused")
295296
*/
296297
public function addFieldsMapping(array $fields, string $index, string $entityType)
297298
{

app/code/Magento/Elasticsearch8/Test/Unit/Model/Client/ElasticsearchTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
/**
2828
* Class ElasticsearchTest to test Elasticsearch 8
29+
*
30+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2931
*/
3032
class ElasticsearchTest extends TestCase
3133
{

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
"magento/module-open-search": "*",
171171
"magento/module-elasticsearch": "*",
172172
"magento/module-elasticsearch-7": "*",
173+
"magento/module-elasticsearch-8": "*",
173174
"magento/module-email": "*",
174175
"magento/module-encryption-key": "*",
175176
"magento/module-fedex": "*",

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
return [
99
'Magento\Elasticsearch' => [
1010
'Magento\Elasticsearch7',
11+
'Magento\Elasticsearch8',
1112
'Magento\OpenSearch'
1213
]
1314
];

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
'Magento\LiveSearch' => [
1212
'Magento\Elasticsearch',
1313
'Magento\Elasticsearch7',
14+
'Magento\Elasticsearch8',
1415
'Magento\OpenSearch'
1516
],
1617
];

setup/src/Magento/Setup/Test/Unit/Model/SearchConfigOptionsListTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ public function testGetOptionsList()
3636
$this->assertEquals('search-engine', $optionsList[0]->getName());
3737

3838
$selectOptions = $optionsList[0]->getSelectOptions();
39-
$this->assertCount(3, $selectOptions);
39+
$this->assertCount(4, $selectOptions);
4040
$this->assertContains('elasticsearch5', $selectOptions);
4141
$this->assertContains('elasticsearch7', $selectOptions);
42+
$this->assertContains('elasticsearch8', $selectOptions);
4243
$this->assertContains('opensearch', $selectOptions);
4344

4445
$this->assertArrayHasKey(1, $optionsList);

0 commit comments

Comments
 (0)