MC-33026: Upgrade magento with MySQL search engine removed

- fix search engine blacklist

Author: danielrenaud

app/code/Magento/Elasticsearch/etc/di.xml

@@ -536,7 +536,7 @@
     <type name="Magento\Search\Model\SearchEngine\Validator">
         <arguments>
             <argument name="engineBlacklist" xsi:type="array">
-                <item name="elasticsearch2" xsi:type="string">elasticsearch2</item>
+                <item name="elasticsearch" xsi:type="string">Elasticsearch 2</item>
             </argument>
             <argument name="engineValidators" xsi:type="array">
                 <item name="elasticsearch5" xsi:type="object">Magento\Elasticsearch\Setup\Validator</item>

app/code/Magento/Search/Model/SearchEngine/Validator.php

@@ -22,7 +22,7 @@ class Validator implements ValidatorInterface
     /**
      * @var array
      */
-    private $engineBlacklist = ['mysql'];
+    private $engineBlacklist = ['mysql' => 'MySQL'];
 
     /**
      * @var ValidatorInterface[]
@@ -55,8 +55,9 @@ public function validate(array $searchConfig = []): array
             ? $searchConfig['search-engine']
             : $this->scopeConfig->getValue('catalog/search/engine');
 
-        if (in_array($currentEngine, $this->engineBlacklist)) {
-            $errors[] = "Search engine '{$currentEngine}' is not supported. Fix search configuration and try again.";
+        if (isset($this->engineBlacklist[$currentEngine])) {
+            $blacklistedEngine = $this->engineBlacklist[$currentEngine];
+            $errors[] = "Search engine '{$blacklistedEngine}' is not supported. Fix search configuration and try again.";
         }
 
         if (isset($this->engineValidators[$currentEngine])) {

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

@@ -34,7 +34,7 @@ protected function setUp()
             [
                 'scopeConfig' => $this->scopeConfigMock,
                 'engineValidators' => ['otherEngine' => $this->otherEngineValidatorMock],
-                'engineBlacklist' => ['badEngine']
+                'engineBlacklist' => ['badEngine' => 'Bad Engine']
             ]
         );
     }
@@ -56,7 +56,7 @@ public function testValidateValid()
 
     public function testValidateBlacklist()
     {
-        $expectedErrors = ["Search engine 'badEngine' is not supported. Fix search configuration and try again."];
+        $expectedErrors = ["Search engine 'Bad Engine' is not supported. Fix search configuration and try again."];
 
         $this->assertEquals($expectedErrors, $this->validator->validate(['search-engine' => 'badEngine']));
     }