Skip to content

Commit a8a0501

Browse files
committed
AC-7116: Fixed static and MTFT test failures
1 parent f944732 commit a8a0501

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ public function __construct(
8585
*
8686
* @return Client
8787
*/
88-
private function getElasticsearchClient(): Client
88+
private function getElasticsearchClient(): Client /** @phpstan-ignore-line */
8989
{
9090
$pid = getmypid();
9191
if (!isset($this->client[$pid])) {
9292
$config = $this->buildESConfig($this->clientOptions);
93-
$this->client[$pid] = ClientBuilder::fromConfig($config, true);
93+
$this->client[$pid] = ClientBuilder::fromConfig($config, true); /** @phpstan-ignore-line */
9494
}
9595
return $this->client[$pid];
9696
}

app/code/Magento/Elasticsearch8/Test/Mftf/Test/StorefrontQuickSearchUsingElasticSearch8ByProductSkuTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
<actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProducts"/>
2727

28-
<createData entity="VirtualProduct" stepKey="createFirstSimpleProduct"/>
28+
<createData entity="VirtualProduct" stepKey="createFirtsSimpleProduct"/>
2929
<createData entity="SimpleProductWithCustomSku24MB06" stepKey="createSecondSimpleProduct"/>
3030
<createData entity="SimpleProductWithCustomSku24MB04" stepKey="createThirdSimpleProduct"/>
3131
<createData entity="SimpleProductWithCustomSku24MB02" stepKey="createFourthSimpleProduct"/>
@@ -37,8 +37,7 @@
3737
<magentoCron groups="index" stepKey="reindex"/>
3838
</before>
3939
<after>
40-
<magentoCLI command="config:set catalog/search/engine elasticsearch7" stepKey="setSearchEngine"/>
41-
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteProductOne"/>
40+
<deleteData createDataKey="createFirtsSimpleProduct" stepKey="deleteProductOne"/>
4241

4342
<actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProductsAfterTest"/>
4443
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class ElasticsearchTest extends TestCase
6262
protected function setUp(): void
6363
{
6464
BypassFinals::enable();
65-
$this->elasticsearchClientMock = $this->getMockBuilder(Client::class)
65+
$this->elasticsearchClientMock = $this->getMockBuilder(Client::class) /** @phpstan-ignore-line */
6666
->setMethods(
6767
[
6868
'indices',
@@ -75,7 +75,7 @@ protected function setUp(): void
7575
)
7676
->disableOriginalConstructor()
7777
->getMock();
78-
$this->indicesMock = $this->getMockBuilder(Indices::class)
78+
$this->indicesMock = $this->getMockBuilder(Indices::class) /** @phpstan-ignore-line */
7979
->setMethods(
8080
[
8181
'exists',
@@ -93,7 +93,7 @@ protected function setUp(): void
9393
)
9494
->disableOriginalConstructor()
9595
->getMock();
96-
$this->elasticsearchResponse = $this->getMockBuilder(ElasticsearchResponse::class)
96+
$this->elasticsearchResponse = $this->getMockBuilder(ElasticsearchResponse::class) /** @phpstan-ignore-line */
9797
->setMethods([
9898
'asBool',
9999
'asArray',

0 commit comments

Comments
 (0)