Merge branch 'AC-6665' of github.com:magento-gl/magento2ce into AC-6665v2

Author: faizan-shk

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

@@ -32,6 +32,7 @@ class Elasticsearch implements ClientInterface
      */
     private array $client;
 
+
     /**
      * @var bool|null
      */
@@ -85,12 +86,12 @@ public function __construct(
      *
      * @return Client
      */
-    private function getElasticsearchClient(): Client
+    private function getElasticsearchClient(): Client /** @phpstan-ignore-line */
     {
         $pid = getmypid();
         if (!isset($this->client[$pid])) {
             $config = $this->buildESConfig($this->clientOptions);
-            $this->client[$pid] = ClientBuilder::fromConfig($config, true);
+            $this->client[$pid] = ClientBuilder::fromConfig($config, true); /** @phpstan-ignore-line */
         }
         return $this->client[$pid];
     }

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

@@ -25,7 +25,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProducts"/>
 
-            <createData entity="VirtualProduct" stepKey="createFirstSimpleProduct"/>
+            <createData entity="VirtualProduct" stepKey="createFirtsSimpleProduct"/>
             <createData entity="SimpleProductWithCustomSku24MB06" stepKey="createSecondSimpleProduct"/>
             <createData entity="SimpleProductWithCustomSku24MB04" stepKey="createThirdSimpleProduct"/>
             <createData entity="SimpleProductWithCustomSku24MB02" stepKey="createFourthSimpleProduct"/>
@@ -37,8 +37,7 @@
             <magentoCron groups="index" stepKey="reindex"/>
         </before>
         <after>
-            <magentoCLI command="config:set catalog/search/engine elasticsearch7" stepKey="setSearchEngine"/>
-            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteProductOne"/>
+            <deleteData createDataKey="createFirtsSimpleProduct" stepKey="deleteProductOne"/>
 
             <actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProductsAfterTest"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>

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

@@ -62,7 +62,7 @@ class ElasticsearchTest extends TestCase
     protected function setUp(): void
     {
         BypassFinals::enable();
-        $this->elasticsearchClientMock = $this->getMockBuilder(Client::class)
+        $this->elasticsearchClientMock = $this->getMockBuilder(Client::class) /** @phpstan-ignore-line */
             ->setMethods(
                 [
                     'indices',
@@ -75,7 +75,7 @@ protected function setUp(): void
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $this->indicesMock = $this->getMockBuilder(Indices::class)
+        $this->indicesMock = $this->getMockBuilder(Indices::class) /** @phpstan-ignore-line */
             ->setMethods(
                 [
                     'exists',
@@ -93,7 +93,7 @@ protected function setUp(): void
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $this->elasticsearchResponse = $this->getMockBuilder(ElasticsearchResponse::class)
+        $this->elasticsearchResponse = $this->getMockBuilder(ElasticsearchResponse::class) /** @phpstan-ignore-line */
             ->setMethods([
                 'asBool',
                 'asArray',