MC-34416: Error in the CLI during upgrade

Author: krissyhiserote

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

@@ -9,6 +9,7 @@
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
@@ -52,22 +53,30 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $searchConfigFactory;
 
+    /*
+     * @var CacheInterface
+     */
+    private $cache;
+
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
+     * @param CacheInterface|null $cache
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
-        AppState $appState = null
+        AppState $appState = null,
+        CacheInterface $cache = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
+        $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
         parent::__construct();
     }
 
@@ -129,6 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer = $this->installerFactory->create(new ConsoleLogger($output));
             $installer->updateModulesSequence($keepGenerated);
             $searchConfig = $this->searchConfigFactory->create();
+            $this->cache->clean();
             $searchConfig->validateSearchEngine();
             $installer->installSchema($request);
             $installer->installDataFixtures($request);

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

@@ -7,7 +7,6 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Setup\Option\AbstractConfigOption;
 use Magento\Framework\Validation\ValidationException;
 use Magento\Search\Model\SearchEngine\Validator;
@@ -34,27 +33,19 @@ class SearchConfig
      */
     private $installConfig;
 
-    /**
-     * @var CacheInterface
-     */
-    private $cache;
-
     /**
      * @param SearchConfigOptionsList $searchConfigOptionsList
      * @param Validator $searchValidator
      * @param CompositeInstallConfig $installConfig
-     * @param CacheInterface $cache
      */
     public function __construct(
         SearchConfigOptionsList $searchConfigOptionsList,
         Validator $searchValidator,
-        CompositeInstallConfig $installConfig,
-        CacheInterface $cache
+        CompositeInstallConfig $installConfig
     ) {
         $this->searchConfigOptionsList = $searchConfigOptionsList;
         $this->searchValidator = $searchValidator;
         $this->installConfig = $installConfig;
-        $this->cache = $cache;
     }
 
     /**
@@ -85,9 +76,6 @@ public function saveConfiguration(array $inputOptions)
      */
     public function validateSearchEngine()
     {
-        // Clean config cache prior to validation
-        $this->cache->clean();
-
         $validationErrors = $this->searchValidator->validate();
         if (!empty($validationErrors)) {
             throw new ValidationException(__(implode(PHP_EOL, $validationErrors)));