MC-33394: Deliver major change Elasticsearch stories

- fix validation on upgrade

Author: danielrenaud

setup/src/Magento/Setup/Model/SearchConfig.php

@@ -7,10 +7,11 @@
 
 namespace Magento\Setup\Model;
 
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Setup\Option\AbstractConfigOption;
 use Magento\Framework\Validation\ValidationException;
-use Magento\Search\Model\SearchEngine\Validator as SearchEngineValidator;
-use Magento\Search\Setup\CompositeInstallConfig as InstallConfig;
+use Magento\Search\Model\SearchEngine\Validator;
+use Magento\Search\Setup\CompositeInstallConfig;
 use Magento\Setup\Exception as SetupException;
 
 /**
@@ -24,28 +25,20 @@ class SearchConfig
     private $searchConfigOptionsList;
 
     /**
-     * @var InstallConfig
+     * @var ObjectManagerInterface
      */
-    private $installConfig;
-
-    /**
-     * @var SearchEngineValidator
-     */
-    private $searchValidator;
+    private $objectManager;
 
     /**
+     * @param ObjectManagerInterface $objectManager
      * @param SearchConfigOptionsList $searchConfigOptionsList
-     * @param InstallConfig $installConfig
-     * @param SearchEngineValidator $searchValidator
      */
     public function __construct(
-        SearchConfigOptionsList $searchConfigOptionsList,
-        InstallConfig $installConfig,
-        SearchEngineValidator $searchValidator
+        ObjectManagerInterface $objectManager,
+        SearchConfigOptionsList $searchConfigOptionsList
     ) {
+        $this->objectManager = $objectManager;
         $this->searchConfigOptionsList = $searchConfigOptionsList;
-        $this->installConfig = $installConfig;
-        $this->searchValidator = $searchValidator;
     }
 
     /**
@@ -62,7 +55,9 @@ public function saveConfiguration(array $inputOptions)
             $this->validateSearchEngineSelection($searchConfigOptions);
         }
         try {
-            $this->installConfig->configure($searchConfigOptions);
+            /** @var CompositeInstallConfig $installConfig */
+            $installConfig = $this->objectManager->get(CompositeInstallConfig::class);
+            $installConfig->configure($searchConfigOptions);
         } catch (\Exception $e) {
             throw new SetupException($e->getMessage());
         }
@@ -77,7 +72,9 @@ public function saveConfiguration(array $inputOptions)
      */
     public function validateSearchEngine(array $config = [])
     {
-        $validationErrors = $this->searchValidator->validate($config);
+        /** @var Validator $searchValidator */
+        $searchValidator = $this->objectManager->get(Validator::class);
+        $validationErrors = $searchValidator->validate($config);
         if (!empty($validationErrors)) {
             throw new ValidationException(__(implode(PHP_EOL, $validationErrors)));
         }

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

@@ -7,6 +7,7 @@
 
 namespace Magento\Setup\Test\Unit\Model;
 
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Search\Model\SearchEngine\Validator;
 use Magento\Search\Setup\CompositeInstallConfig;
@@ -45,15 +46,19 @@ protected function setUp()
         $this->searchEngineValidatorMock = $this->getMockBuilder(Validator::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+        $objectManagerMock->expects($this->any())->method('get')->willReturnMap([
+            [CompositeInstallConfig::class, $this->installConfigMock],
+            [Validator::class, $this->searchEngineValidatorMock]
+        ]);
 
         $objectManager = new ObjectManager($this);
         $this->searchConfigOptionsList = $objectManager->getObject(SearchConfigOptionsList::class);
         $this->searchConfig = $objectManager->getObject(
             SearchConfig::class,
             [
+                'objectManager' => $objectManagerMock,
                 'searchConfigOptionsList' => $this->searchConfigOptionsList,
-                'installConfig' => $this->installConfigMock,
-                'searchValidator' =>$this->searchEngineValidatorMock
             ]
         );
     }