Merge remote-tracking branch 'ogresCE/MAGETWO-44382-cli-error-message' into PR_Branch

Author: mazhalai

lib/internal/Magento/Framework/Console/Cli.php

@@ -11,6 +11,8 @@
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\Shell\ComplexParameter;
 use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Magento2 CLI Application. This is the hood for all command line tools supported by Magento.
@@ -27,6 +29,34 @@ class Cli extends SymfonyApplication
     /** @var \Zend\ServiceManager\ServiceManager */
     private $serviceManager;
 
+    /**
+     * Initialization exception
+     *
+     * @var \Exception
+     */
+    private $initException;
+
+    /**
+     * Process an error happened during initialization of commands, if any
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws \Exception
+     */
+    public function doRun(InputInterface $input, OutputInterface $output)
+    {
+        $exitCode = parent::doRun($input, $output);
+        if ($this->initException) {
+            $output->writeln(
+                "<error>We're sorry, an error occurred. Try clearing the cache and code generation directories. "
+                . "By default, they are: var/cache, var/di, var/generation, and var/page_cache.</error>"
+            );
+            throw $this->initException;
+        }
+        return $exitCode;
+    }
+
     /**
      * @param string $name    The name of the application
      * @param string $version The version of the application
@@ -61,38 +91,33 @@ protected function getDefaultCommands()
      */
     protected function getApplicationCommands()
     {
-        $setupCommands   = [];
-        $modulesCommands = [];
+        $commands = [];
+        try {
+            $bootstrapParam = new ComplexParameter(self::INPUT_KEY_BOOTSTRAP);
+            $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
+            $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
+            $bootstrap = Bootstrap::create(BP, $params);
+            $objectManager = $bootstrap->getObjectManager();
+            /** @var \Magento\Setup\Model\ObjectManagerProvider $omProvider */
+            $omProvider = $this->serviceManager->get('Magento\Setup\Model\ObjectManagerProvider');
+            $omProvider->setObjectManager($objectManager);
 
-        $bootstrapParam = new ComplexParameter(self::INPUT_KEY_BOOTSTRAP);
-        $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
-        $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
-        $bootstrap = Bootstrap::create(BP, $params);
-        $objectManager = $bootstrap->getObjectManager();
-        /** @var \Magento\Setup\Model\ObjectManagerProvider $omProvider */
-        $omProvider = $this->serviceManager->get('Magento\Setup\Model\ObjectManagerProvider');
-        $omProvider->setObjectManager($objectManager);
+            if (class_exists('Magento\Setup\Console\CommandList')) {
+                $setupCommandList = new \Magento\Setup\Console\CommandList($this->serviceManager);
+                $commands = array_merge($commands, $setupCommandList->getCommands());
+            }
 
-        if (class_exists('Magento\Setup\Console\CommandList')) {
-            $setupCommandList = new \Magento\Setup\Console\CommandList($this->serviceManager);
-            $setupCommands = $setupCommandList->getCommands();
-        }
+            if ($objectManager->get('Magento\Framework\App\DeploymentConfig')->isAvailable()) {
+                /** @var \Magento\Framework\Console\CommandList $commandList */
+                $commandList = $objectManager->create('Magento\Framework\Console\CommandList');
+                $commands = array_merge($commands, $commandList->getCommands());
+            }
 
-        if ($objectManager->get('Magento\Framework\App\DeploymentConfig')->isAvailable()) {
-            /** @var \Magento\Framework\Console\CommandList $commandList */
-            $commandList = $objectManager->create('Magento\Framework\Console\CommandList');
-            $modulesCommands = $commandList->getCommands();
+            $commands = array_merge($commands, $this->getVendorCommands($objectManager));
+        } catch (\Exception $e) {
+            $this->initException = $e;
         }
-
-        $vendorCommands = $this->getVendorCommands($objectManager);
-
-        $commandsList = array_merge(
-            $setupCommands,
-            $modulesCommands,
-            $vendorCommands
-        );
-
-        return $commandsList;
+        return $commands;
     }
 
     /**