Properly split git from github runner

horde · Nov 15, 2023 · c1550bc · c1550bc
1 parent 6230a6d
commit c1550bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "horde/autoloader": "*",
         "horde/argv": "*",
         "horde/cli": "^3",
-        "horde/cli_modular": "^3",
+        "horde/cli_modular": "dev-FRAMEWORK_6_0",
         "horde/http": "*",
         "horde/pear": "*",
         "horde/role": "*",

diff --git a/src/Module/Git.php b/src/Module/Git.php
@@ -149,6 +149,11 @@ public function handle(Config $config): bool
             $this->dependencies->get(RunnerGithub::class)->run();
             return true;
         }
+        if (!empty($options['git'])
+            || (isset($arguments[0]) && $arguments[0] == 'git')) {
+            $this->dependencies->get(RunnerGit::class)->run();
+            return true;
+        }
         return false;
     }
 }
diff --git a/src/Module/Help.php b/src/Module/Help.php
@@ -103,7 +103,7 @@ public function handle(Config $config): bool
                 $action = '';
             }
             $formatter = new \Horde_Argv_IndentedHelpFormatter();
-            $modules = $this->_dependencies->get(ModularCli::class)->getModules();
+            $modules = $this->dependencies->get(ModularCli::class)->getModules();
             foreach ($modules as $module) {
                 $element = $module;
                 if (in_array($action, $element->getActions())) {