Refactor config/Common.php

kenjis · kenjis · commit f2c8f70b52bd · 2015-05-08T06:01:03.000+09:00
diff --git a/config/Common.php b/config/Common.php
@@ -54,8 +54,7 @@ public function define(Container $di)
     public function modify(Container $di)
     {
         $this->modifyLogger($di);
-        $this->modifyCliDispatcher($di);
-        $this->modifyCliHelpService($di);
+        $this->modifyCliDispatcherAndHelp($di);
     }
 
     protected function modifyLogger(Container $di)
@@ -73,12 +72,13 @@ protected function modifyLogger(Container $di)
         ));
     }
 
-    protected function modifyCliDispatcher(Container $di)
+    protected function modifyCliDispatcherAndHelp(Container $di)
     {
 //        $context = $di->get('aura/cli-kernel:context');
 //        $stdio = $di->get('aura/cli-kernel:stdio');
 //        $logger = $di->get('aura/project-kernel:logger');
         $dispatcher = $di->get('aura/cli-kernel:dispatcher');
+        $help_service = $di->get('aura/cli-kernel:help_service');
 
         // register system commands
         foreach ($this->commands as $command) {
@@ -88,31 +88,17 @@ protected function modifyCliDispatcher(Container $di)
                 $command_name,
                 $di->lazyNew($class)
             );
-        }
-
-        // register user commands
-        UserConfig::registerCommands($di, $dispatcher, $this->user_command_paths);
-    }
-
-    protected function modifyCliHelpService(Container $di)
-    {
-        $help_service = $di->get('aura/cli-kernel:help_service');
 
-        // register system command helps
-        foreach ($this->commands as $command) {
-            $class = 'Kenjis\CodeIgniter_Cli\Command\\' . $command . 'Help';
-            $command_name = strtolower($command);
+            $help_class = 'Kenjis\CodeIgniter_Cli\Command\\' . $command . 'Help';
             $help_service->set(
                 $command_name,
-                $di->lazyNew($class)
+                $di->lazyNew($help_class)
             );
         }
 
-        // register user command helps
-        UserConfig::registerCommandHelps(
-            $di,
-            $help_service,
-            $this->user_command_paths
+                // register user commands
+        UserConfig::registerCommands(
+            $di, $dispatcher, $help_service, $this->user_command_paths
         );
     }
 }
diff --git a/src/UserConfig.php b/src/UserConfig.php
@@ -50,7 +50,9 @@ protected static function findClass(Container $di, $file)
         return $classname;
     }
 
-    public static function registerCommands(Container $di, $dispatcher, array $paths)
+    public static function registerCommands(
+        Container $di, $dispatcher, $help_service, array $paths
+    )
     {
         foreach ($paths as $path) {
             foreach (glob($path . '*Command.php') as $file) {
@@ -65,12 +67,7 @@ public static function registerCommands(Container $di, $dispatcher, array $paths
                     $di->lazyNew($classname)
                 );
             }
-        }
-    }
 
-    public static function registerCommandHelps(Container $di, $help_service, array $paths)
-    {
-        foreach ($paths as $path) {
             foreach (glob($path . '*CommandHelp.php') as $file) {
                 $classname = static::findClass($di, $file);
                 if ($classname === '') {
diff --git a/tests/UserConfigTest.php b/tests/UserConfigTest.php
@@ -59,22 +59,15 @@ public function test_registerCommands()
             ]
         ));
         $dispatcher = $this->di->get('aura/cli-kernel:dispatcher');
-        $paths = [ __DIR__ . '/Fake/user_commands/' ];
-        UserConfig::registerCommands($this->di, $dispatcher, $paths);
-        
-        $this->assertTrue($dispatcher->hasObject('test'));
-    }
-
-    public function test_registerCommandHelps()
-    {
         $this->di->set(
             'aura/cli-kernel:help_service',
             $this->di->lazyNew('Aura\Cli_Kernel\HelpService')
         );
         $help_service = $this->di->get('aura/cli-kernel:help_service');
         $paths = [ __DIR__ . '/Fake/user_commands/' ];
-        UserConfig::registerCommandHelps($this->di, $help_service, $paths);
+        UserConfig::registerCommands($this->di, $dispatcher, $help_service, $paths);
         
+        $this->assertTrue($dispatcher->hasObject('test'));
         $this->assertTrue($help_service->has('test'));
     }
 }
