Merge pull request #695 from magento-fearless-kiwis/MAGETWO-62400-Cli-pre-install

MAGETWO-62400 - Cli pre install

Author: heyitsroberthe

app/code/Magento/Deploy/Console/CommandList.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Deploy\Console;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * This class groups and instantiates a list of deploy commands in order to be used separately before install
+ */
+class CommandList implements \Magento\Framework\Console\CommandListInterface
+{
+    /**
+     * Object Manager
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Gets list of command classes
+     *
+     * @return string[]
+     */
+    protected function getCommandsClasses()
+    {
+        return [
+            \Magento\Deploy\Console\Command\DeployStaticContentCommand::class
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCommands()
+    {
+        $commands = [];
+        foreach ($this->getCommandsClasses() as $class) {
+            if (class_exists($class)) {
+                $commands[] = $this->objectManager->get($class);
+            } else {
+                throw new \Exception('Class ' . $class . ' does not exist');
+            }
+        }
+        return $commands;
+    }
+}

app/code/Magento/Deploy/cli_commands.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+if (PHP_SAPI == 'cli') {
+    \Magento\Framework\Console\CommandLocator::register('Magento\Deploy\Console\CommandList');
+}

app/code/Magento/Deploy/composer.json

@@ -16,6 +16,7 @@
     ],
     "autoload": {
         "files": [
+            "cli_commands.php",
             "registration.php"
         ],
         "psr-4": {

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

@@ -126,17 +126,21 @@ protected function getApplicationCommands()
             $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')) {
+            // Specialized setup command list available before and after M2 install
+            if (class_exists('Magento\Setup\Console\CommandList')
+                && class_exists('Magento\Setup\Model\ObjectManagerProvider')
+            ) {
+                /** @var \Magento\Setup\Model\ObjectManagerProvider $omProvider */
+                $omProvider = $this->serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class);
+                $omProvider->setObjectManager($objectManager);
                 $setupCommandList = new \Magento\Setup\Console\CommandList($this->serviceManager);
                 $commands = array_merge($commands, $setupCommandList->getCommands());
             }
 
-            if (count($objectManager->get(\Magento\Framework\App\DeploymentConfig::class)->get('modules'))) {
-                /** @var \Magento\Framework\Console\CommandListInterface */
+            // Allowing instances of all modular commands only after M2 install
+            if ($objectManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
+                /** @var \Magento\Framework\Console\CommandListInterface $commandList */
                 $commandList = $objectManager->create(\Magento\Framework\Console\CommandListInterface::class);
                 $commands = array_merge($commands, $commandList->getCommands());
             }