MAGETWO-62400: Modules that use repositories in command line tools fail during setup:di:compile 2.1.x

- adding comments and setting class names by static accessor

Author: cpartica

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

@@ -8,7 +8,7 @@
 use Magento\Framework\ObjectManagerInterface;
 
 /**
- * Class CommandList
+ * 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
 {
@@ -35,7 +35,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     protected function getCommandsClasses()
     {
         return [
-            'Magento\Deploy\Console\Command\DeployStaticContentCommand'
+            \Magento\Deploy\Console\Command\DeployStaticContentCommand::class
         ];
     }
 

app/code/Magento/Deploy/cli_commands.php

@@ -5,5 +5,5 @@
  */
 
 if (PHP_SAPI == 'cli') {
-    \Magento\Framework\Console\CommandLocator::register('Magento\Deploy\Console\CommandList');
+    \Magento\Framework\Console\CommandLocator::register(Magento\Deploy\Console\CommandList::class);
 }

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

@@ -126,15 +126,19 @@ 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\ObjectManagerProvide')
+            ) {
+                /** @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());
             }
 
+            // 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);