MC-33026: Upgrade magento with MySQL search engine removed

- fix build errors

Author: danielrenaud

app/code/Magento/Elasticsearch/Test/Unit/Setup/ValidatorTest.php

@@ -73,7 +73,7 @@ public function testValidateFail()
         $this->elasticsearchClientMock->expects($this->once())->method('testConnection')->willReturn(false);
 
         $expected = ['Elasticsearch connection validation failed'];
-        $this->assertEquals($expected, $this->validator->validate(['engine' => $searchEngine]));
+        $this->assertEquals($expected, $this->validator->validate(['search-engine' => $searchEngine]));
     }
 
     public function testValidateFailException()

app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php

@@ -33,7 +33,7 @@ protected function setUp()
             Validator::class,
             [
                 'scopeConfig' => $this->scopeConfigMock,
-                'engineValidators' => ['other-engine' => $this->otherEngineValidatorMock],
+                'engineValidators' => ['otherEngine' => $this->otherEngineValidatorMock],
                 'engineBlacklist' => ['badEngine']
             ]
         );
@@ -47,7 +47,7 @@ public function testValidateValid()
             ->expects($this->once())
             ->method('getValue')
             ->with('catalog/search/engine')
-            ->willReturn('other-engine');
+            ->willReturn('otherEngine');
 
         $this->otherEngineValidatorMock->expects($this->once())->method('validate')->willReturn([]);
 
@@ -58,18 +58,18 @@ public function testValidateBlacklist()
     {
         $expectedErrors = ["Search engine 'badEngine' is not supported. Fix search configuration and try again."];
 
-        $this->assertEquals($expectedErrors, $this->validator->validate(['engine' => 'badEngine']));
+        $this->assertEquals($expectedErrors, $this->validator->validate(['search-engine' => 'badEngine']));
     }
 
     public function testValidateInvalid()
     {
-        $expectedErrors = ['Validation failed for other-engine'];
+        $expectedErrors = ['Validation failed for otherEngine'];
 
         $this->otherEngineValidatorMock
             ->expects($this->once())
             ->method('validate')
             ->willReturn($expectedErrors);
 
-        $this->assertEquals($expectedErrors, $this->validator->validate(['engine' => 'other-engine']));
+        $this->assertEquals($expectedErrors, $this->validator->validate(['search-engine' => 'otherEngine']));
     }
 }

setup/src/Magento/Setup/Console/Command/UpgradeCommand.php

@@ -138,7 +138,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $arrayInput->setInteractive($input->isInteractive());
                 $result = $importConfigCommand->run($arrayInput, $output);
                 if ($result === \Magento\Framework\Console\Cli::RETURN_FAILURE) {
-                    throw new \Magento\Framework\Exception\RuntimeException(__('%1 failed. See previous output.', ConfigImportCommand::COMMAND_NAME));
+                    throw new \Magento\Framework\Exception\RuntimeException(
+                        __('%1 failed. See previous output.', ConfigImportCommand::COMMAND_NAME)
+                    );
                 }
             }
 

setup/src/Magento/Setup/Controller/SearchEngineCheck.php

@@ -70,11 +70,11 @@ public function indexAction(): JsonModel
     /**
      * Check search engine parameter is valid
      *
-     * @param $requestParams
+     * @param array $requestParams
      * @return bool
      * @throws InputException
      */
-    private function isValidSearchEngine($requestParams): bool
+    private function isValidSearchEngine(array $requestParams): bool
     {
         $selectedEngine = $requestParams['engine'] ?? null;
         $availableSearchEngines = $this->searchConfigOptionsList->getAvailableSearchEngineList();

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

@@ -66,7 +66,11 @@ protected function setUp()
     public function testSaveConfiguration(array $installInput, array $searchInput)
     {
         $this->installConfigMock->expects($this->once())->method('configure')->with($searchInput);
-        $this->searchEngineValidatorMock->expects($this->once())->method('validate')->with($searchInput)->willReturn([]);
+        $this->searchEngineValidatorMock
+            ->expects($this->once())
+            ->method('validate')
+            ->with($searchInput)
+            ->willReturn([]);
 
         $this->searchConfig->saveConfiguration($installInput);
     }