starting to move dimensions from core into plugins and put each dimension into its own class. This is very experimental right now. More experimental stuff will follow

1 files changed, 2 insertions, 29 deletions

diff --git a/core/Console.php b/core/Console.php
index 7cf657e683..097da68b45 100644
--- a/core/Console.php
+++ b/core/Console.php
@@ -72,11 +72,9 @@ class Console extends Application
     private function getAvailableCommands()
     {
         $commands = $this->getDefaultPiwikCommands();
+        $detected = PluginManager::getInstance()->findMultipleComponents('Commands', 'Piwik\\Plugin\\ConsoleCommand');
 
-        $pluginNames = PluginManager::getInstance()->getLoadedPluginsName();
-        foreach ($pluginNames as $pluginName) {
-            $commands = array_merge($commands, $this->findCommandsInPlugin($pluginName));
-        }
+        $commands = array_merge($commands, $detected);
 
         /**
          * Triggered to filter / restrict console commands. Plugins that want to restrict commands
@@ -101,31 +99,6 @@ class Console extends Application
         return $commands;
     }
 
-    private function findCommandsInPlugin($pluginName)
-    {
-        $commands = array();
-
-        $files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/plugins/' . $pluginName .'/Commands', '*.php');
-
-        foreach ($files as $file) {
-            $klassName = sprintf('Piwik\\Plugins\\%s\\Commands\\%s', $pluginName, basename($file, '.php'));
-
-            if (!class_exists($klassName) || !is_subclass_of($klassName, 'Piwik\\Plugin\\ConsoleCommand')) {
-                continue;
-            }
-
-            $klass = new \ReflectionClass($klassName);
-
-            if ($klass->isAbstract()) {
-                continue;
-            }
-
-            $commands[] = $klassName;
-        }
-
-        return $commands;
-    }
-
     private function checkCompatibility()
     {
         if (Common::isPhpCgiType()) {