MC-31098: Add support of Elasticsearch7 to codebase

Author: irenelagno

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

@@ -49,8 +49,10 @@ public function __construct(
                 __('The search failed because of a search engine misconfiguration.')
             );
         }
-
-        $this->client[getmypid()] = $elasticsearchClient;
+        // phpstan:ignore
+        if ($elasticsearchClient instanceof \Elasticsearch\Client) {
+            $this->client[getmypid()] = $elasticsearchClient;
+        }
         $this->clientOptions = $options;
     }
 
@@ -73,7 +75,7 @@ public function suggest(array $query) : array
     private function getElasticsearchClient(): \Elasticsearch\Client
     {
         $pid = getmypid();
-        if (!isset($this->client[$pid]) || !($this->client[$pid] instanceof \Elasticsearch\Client)) {
+        if (!isset($this->client[$pid])) {
             $config = $this->buildESConfig($this->clientOptions);
             $this->client[$pid] = \Elasticsearch\ClientBuilder::fromConfig($config, true);
         }

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

@@ -605,7 +605,7 @@ public function testQuery()
      */
     public function testSuggest()
     {
-        $query = 'query';
+        $query = ['query'];
         $this->elasticsearchClientMock->expects($this->once())
             ->method('suggest')
             ->willReturn([]);

app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php

@@ -98,7 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln($e->getMessage());
             } catch (\Exception $e) {
                 $output->writeln($indexer->getTitle() . ' indexer process unknown error:');
-                $output->writeln([$e->getMessage()]);
+                $output->writeln($e->getMessage());
             }
         }
         return $returnValue;