MAGETWO-35132: Create console shell

- moved Application class to framework
kulwinders433 · Mar 19, 2015 · 42b8e55 · 42b8e55
1 parent 6aaee65
commit 42b8e55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/bin/magento b/bin/magento
@@ -8,7 +8,7 @@
 try {
     require __DIR__ . '/../app/bootstrap.php';
     if (PHP_SAPI == 'cli') {
-        $application = new Magento\Setup\Console\Application('Magento CLI');
+        $application = new Magento\Framework\Cli('Magento CLI');
         $application->run();
     }
 

diff --git a/...src/Magento/Setup/Console/Application.php → lib/internal/Magento/Framework/Cli.php b/...src/Magento/Setup/Console/Application.php → lib/internal/Magento/Framework/Cli.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Console;
+namespace Magento\Framework;
 
 use Symfony\Component\Console\Application as SymfonyApplication;
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\Shell\ComplexParameter;
 
 /**
- * Magento2 CLI Application
+ * Magento2 CLI Application. This is the hood for all command line tools supported by Magento.
  *
  * {@inheritdoc}
  */
-class Application extends SymfonyApplication
+class Cli extends SymfonyApplication
 {
     /**
      * {@inheritdoc}
@@ -37,8 +37,6 @@ protected function getDefaultCommands()
      */
     protected function getApplicationCommands()
     {
-        // TODO: this application class should be moved and probably refactored in scope of MAGETWO-35132
-
         $setupCommands   = [];
         $toolsCommands   = [];
         $modulesCommands = [];
@@ -47,10 +45,10 @@ protected function getApplicationCommands()
         $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
         $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
         $bootstrap = Bootstrap::create(BP, $params);
+        $serviceManager = \Zend\Mvc\Application::init(require BP . '/setup/config/application.config.php')
+            ->getServiceManager();
 
         if (class_exists('Magento\Setup\Console\CommandList')) {
-            $serviceManager = \Zend\Mvc\Application::init(require BP . '/setup/config/application.config.php')
-                ->getServiceManager();
             $setupCommandList = new \Magento\Setup\Console\CommandList($serviceManager);
             $setupCommands = $setupCommandList->getCommands();
         }
@@ -60,9 +58,7 @@ protected function getApplicationCommands()
             $toolsCommands = $toolsCommandList->getCommands();
         }
 
-        // TODO: do we need to change this for better solution?
-        if ($bootstrap->isInstalled()) {
-
+        if ($serviceManager->get('Magento\Framework\App\DeploymentConfig')->isAvailable()) {
             $objectManager = $bootstrap->getObjectManager();
             $commandList = $objectManager->create(
                 'Magento\Framework\Console\CommandList',