Skip to content

Commit 24b4587

Browse files
committed
AC-13818::Make ES8 to be default for 2.4.8 instead of ES7
1 parent 2bf62d8 commit 24b4587

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@ public function __construct(
7878
}
7979
$this->clientOptions = $options;
8080
$this->fieldsMappingPreprocessors = $fieldsMappingPreprocessors;
81-
// phpstan:ignore "File has calls static method. (phpStaticMethodCalls)"
8281
$this->dynamicTemplatesProvider = $dynamicTemplatesProvider ?: ObjectManager::getInstance()
83-
->get(DynamicTemplatesProvider::class);
82+
->get(DynamicTemplatesProvider::class); /** @phpstan-ignore-line */
8483
}
8584

8685
/**

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ class ElasticsearchTest extends TestCase
6060
*/
6161
protected function setUp(): void
6262
{
63-
// phpstan:ignore "File has calls static method. (phpStaticMethodCalls)"
64-
BypassFinals::enable();
63+
BypassFinals::enable(); /** @phpstan-ignore-line */
6564
$this->elasticsearchClientMock = $this->getMockBuilder(Client::class) /** @phpstan-ignore-line */
6665
->onlyMethods(
6766
[

dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/whitelist/redundant_dependencies_ce.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@
66
declare(strict_types=1);
77

88
return [
9-
'Magento\Elasticsearch' => [
10-
'magento/elasticsearch' => 'magento/elasticsearch',
11-
],
12-
'Magento\Elasticsearch7' => [
13-
'magento/elasticsearch' => 'magento/elasticsearch',
14-
],
159
'Magento\Captcha' => [
1610
'magento/laminas-db' => 'magento/laminas-db',
1711
]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2022 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

0 commit comments

Comments
 (0)