MAGETWO-53474: [Github] Caches Aren't Enabled by Default on RC1 with Composer when Upgrading via CLI

- Moving logic to re-enable cache to setup:upgrade

Author: mazhalai

lib/internal/Magento/Framework/Code/GeneratedFiles.php

@@ -52,13 +52,15 @@ public function __construct(DirectoryList $directoryList, WriteFactory $writeFac
     public function regenerate()
     {
         if ($this->write->isExist(self::REGENERATE_FLAG)) {
+            //TODO: to be removed in scope of MAGETWO-53476
             //clean cache
             $deploymentConfig = $this->directoryList->getPath(DirectoryList::CONFIG);
             $configPool = new ConfigFilePool();
             $envPath = $deploymentConfig . '/' . $configPool->getPath(ConfigFilePool::APP_ENV);
             if ($this->write->isExist($this->write->getRelativePath($envPath))) {
                 $this->saveCacheStatus($envPath);
             }
+            //TODO: Till here
             $cachePath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::CACHE));
             $generationPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::GENERATION));
             $diPath = $this->write->getRelativePath($this->directoryList->getPath(DirectoryList::DI));

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

@@ -5,10 +5,13 @@
  */
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Backend\Console\Command\AbstractCacheManageCommand;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Setup\Model\ObjectManagerProvider;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -94,5 +97,28 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!$keepGenerated) {
             $output->writeln('<info>Please re-run Magento compile command</info>');
         }
+
+        //TODO: to be removed in scope of MAGETWO-53476
+        $writeFactory = $objectManager->get('\Magento\Framework\Filesystem\Directory\WriteFactory');
+        $write = $writeFactory->create(BP);
+        /** @var \Magento\Framework\App\Filesystem\DirectoryList $dirList */
+        $dirList = $objectManager->get('\Magento\Framework\App\Filesystem\DirectoryList');
+
+        $pathToCacheStatus = $write->getRelativePath($dirList->getPath(DirectoryList::VAR_DIR) . '/.cachestates.json');
+
+        if ($write->isExist($pathToCacheStatus)) {
+            $params = array_keys(json_decode($write->readFile($pathToCacheStatus), true));
+            $command = $this->getApplication()->find('cache:enable');
+
+            $arguments = ['command' => 'cache:enable', AbstractCacheManageCommand::INPUT_KEY_TYPES    => $params ];
+            $returnCode = $command->run(new ArrayInput($arguments), $output);
+
+            $write->delete($pathToCacheStatus);
+            if (isset($returnCode) && $returnCode > 0) {
+                $output->writeln('<error> Error occured during upgrade</error>');
+                return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            }
+            return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        }
     }
 }

setup/src/Magento/Setup/Model/Cron/JobUpgrade.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Setup\Model\Cron;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
 use Magento\Setup\Console\Command\AbstractSetupCommand;
 use Magento\Setup\Model\ObjectManagerProvider;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -72,26 +70,6 @@ public function execute()
             );
             $this->params['command'] = 'setup:upgrade';
             $this->command->run(new ArrayInput($this->params), $this->output);
-
-            /**
-             * @var \Magento\Framework\Filesystem\Directory\WriteFactory $writeFactory
-             */
-            $writeFactory = $this->objectManager->get('\Magento\Framework\Filesystem\Directory\WriteFactory');
-            $write = $writeFactory->create(BP);
-            $dirList = $this->objectManager->get('\Magento\Framework\App\Filesystem\DirectoryList');
-            $pathToCacheStatus = $write->getRelativePath(
-                $dirList->getPath(DirectoryList::VAR_DIR) . '/.cachestates.json'
-            );
-
-            if ($write->isExist($pathToCacheStatus)) {
-                $params = array_keys(json_decode($write->readFile($pathToCacheStatus), true));
-
-                $this->queue->addJobs(
-                    [['name' => JobFactory::JOB_ENABLE_CACHE, 'params' =>  [implode(' ', $params)]]]
-                );
-                $write->delete($pathToCacheStatus);
-            }
-
         } catch (\Exception $e) {
             $this->status->toggleUpdateError(true);
             throw new \RuntimeException(sprintf('Could not complete %s successfully: %s', $this, $e->getMessage()));