coding style fixes, some PHPStorm inspection fixes, improved readability of code, few refactorings, all as part of our code cleanup strategy

1 files changed, 17 insertions, 7 deletions

diff --git a/core/Console.php b/core/Console.php
index 03f9df438d..1f418fc79a 100644
--- a/core/Console.php
+++ b/core/Console.php
@@ -40,6 +40,7 @@ class Console extends Application
     {
         $this->initPiwikHost($input);
         $this->initConfig($output);
+
         try {
             self::initPlugins();
         } catch(\Exception $e) {
@@ -51,18 +52,23 @@ class Console extends Application
         $commands = $this->getAvailableCommands();
 
         foreach ($commands as $command) {
-            if (!class_exists($command)) {
-                Log::warning(sprintf('Cannot add command %s, class does not exist', $command));
-            } elseif (!is_subclass_of($command, 'Piwik\Plugin\ConsoleCommand')) {
-                Log::warning(sprintf('Cannot add command %s, class does not extend Piwik\Plugin\ConsoleCommand', $command));
-            } else {
-                $this->add(new $command);
-            }
+            $this->addCommandIfExists($command);
         }
 
         return parent::doRun($input, $output);
     }
 
+    private function addCommandIfExists($command)
+    {
+        if (!class_exists($command)) {
+            Log::warning(sprintf('Cannot add command %s, class does not exist', $command));
+        } elseif (!is_subclass_of($command, 'Piwik\Plugin\ConsoleCommand')) {
+            Log::warning(sprintf('Cannot add command %s, class does not extend Piwik\Plugin\ConsoleCommand', $command));
+        } else {
+            $this->add(new $command);
+        }
+    }
+
     /**
      * Returns a list of available command classnames.
      *
@@ -128,9 +134,11 @@ class Console extends Application
     protected function initConfig(OutputInterface $output)
     {
         $config = Config::getInstance();
+
         try {
             $config->checkLocalConfigFound();
             return $config;
+
         } catch (\Exception $e) {
             $output->writeln($e->getMessage() . "\n");
         }
@@ -151,6 +159,8 @@ class Console extends Application
             $extra = new \Piwik\Plugins\EnterpriseAdmin\EnterpriseAdmin();
             $extra->addConsoleCommands($commands);
         }
+
         return $commands;
     }
+
 }