[FEATURE] Unify command registration

Classes/Composer/InstallerScript/PopulateCommandConfiguration.php

@@ -15,6 +15,7 @@
  */
 
 use Composer\Script\Event as ScriptEvent;
+use Helhum\Typo3Console\Mvc\Cli\CommandConfiguration;
 use TYPO3\CMS\Composer\Plugin\Core\InstallerScript;
 
 /**
@@ -50,6 +51,7 @@ public function run(ScriptEvent $event): bool
             }
             $commandConfiguration = array_merge($commandConfiguration, $this->getConfigFromPackage($installPath, $packageName));
         }
+
         $success = file_put_contents(
             __DIR__ . '/../../../Configuration/Console/ComposerPackagesCommands.php',
             '<?php' . chr(10)
@@ -65,7 +67,7 @@ public function run(ScriptEvent $event): bool
      * @param \Composer\Composer $composer
      * @return array
      */
-    private function extractPackageMapFromComposer(\Composer\Composer $composer)
+    private function extractPackageMapFromComposer(\Composer\Composer $composer): array
     {
         $mainPackage = $composer->getPackage();
         $autoLoadGenerator = $composer->getAutoloadGenerator();
@@ -74,10 +76,12 @@ private function extractPackageMapFromComposer(\Composer\Composer $composer)
     }
 
     /**
-     * @param $installPath
-     * @return mixed
+     * @param string $installPath
+     * @param string $packageName
+     * @throws \Symfony\Component\Console\Exception\RuntimeException
+     * @return array
      */
-    private function getConfigFromPackage(string $installPath, string $packageName)
+    private function getConfigFromPackage(string $installPath, string $packageName): array
     {
         $commandConfiguration = [];
         if (file_exists($commandConfigurationFile = $installPath . '/Configuration/Console/Commands.php')) {
@@ -89,6 +93,7 @@ private function getConfigFromPackage(string $installPath, string $packageName)
         if (empty($commandConfiguration)) {
             return [];
         }
-        return [$packageName => $commandConfiguration];
+        CommandConfiguration::ensureValidCommandRegistration($commandConfiguration, $packageName);
+        return [$packageName => CommandConfiguration::unifyCommandConfiguration($commandConfiguration, $packageName)];
     }
 }

Classes/Core/Booting/RunLevel.php

@@ -292,13 +292,13 @@ private function addStep(Sequence $sequence, string $stepIdentifier)
      * @return string
      * @internal
      */
-    private function getRunLevelForCommand(string $commandIdentifier): string
+    public function getRunLevelForCommand(string $commandIdentifier): string
     {
-        if (in_array($commandIdentifier, ['', 'help', 'list'], true)) {
+        if (in_array($commandIdentifier, ['help', 'list'], true)) {
             return $this->getMaximumAvailableRunLevel();
         }
         $options = $this->getOptionsForCommand($commandIdentifier);
-        return isset($options['runLevel']) ? $options['runLevel'] : self::LEVEL_FULL;
+        return $options['runLevel'] ?? self::LEVEL_FULL;
     }
 
     /**
@@ -337,30 +337,19 @@ private function removeStepsForCommand(Sequence $sequence, string $commandIdenti
      */
     private function getOptionsForCommand(string $commandIdentifier)
     {
-        $commandIdentifierParts = explode(':', $commandIdentifier);
-        if (count($commandIdentifierParts) < 2 || count($commandIdentifierParts) > 3) {
-            return null;
+        $commandIdentifierPrefix = $commandIdentifier;
+        $position = strrpos($commandIdentifier, ':');
+        if ($position !== false) {
+            $commandIdentifierPrefix = substr($commandIdentifier, 0, $position);
         }
+
         if (isset($this->commandOptions[$commandIdentifier])) {
             return $this->commandOptions[$commandIdentifier];
         }
 
-        if (count($commandIdentifierParts) === 3) {
-            $currentCommandControllerName = $commandIdentifierParts[1];
-            $currentCommandName = $commandIdentifierParts[2];
-        } else {
-            $currentCommandControllerName = $commandIdentifierParts[0];
-            $currentCommandName = $commandIdentifierParts[1];
-        }
-
-        foreach ($this->commandOptions as $fullControllerIdentifier => $commandRegistry) {
-            list(, $controllerName, $commandName) = explode(':', $fullControllerIdentifier);
-            if ($controllerName === $currentCommandControllerName && $commandName === $currentCommandName) {
-                return $this->commandOptions[$fullControllerIdentifier];
-            }
-            if ($controllerName === $currentCommandControllerName && $commandName === '*') {
-                return $this->commandOptions[$fullControllerIdentifier];
-            }
+        $lookupKey = $commandIdentifierPrefix . ':*';
+        if (isset($this->commandOptions[$lookupKey])) {
+            return $this->commandOptions[$lookupKey];
         }
 
         return null;

Classes/Core/Kernel.php

@@ -17,14 +17,15 @@
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Helhum\Typo3Console\Core\Booting\RunLevel;
 use Helhum\Typo3Console\Core\Booting\Scripts;
+use Helhum\Typo3Console\Exception;
 use Helhum\Typo3Console\Mvc\Cli\CommandCollection;
+use Helhum\Typo3Console\Mvc\Cli\CommandConfiguration;
 use Helhum\Typo3Console\Mvc\Cli\Symfony\Application;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputInterface;
 use TYPO3\CMS\Core\Core\Bootstrap;
 use TYPO3\CMS\Core\Package\PackageManager;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Mvc\Cli\CommandManager;
-use TYPO3\CMS\Extbase\Object\ObjectManager;
 
 /**
  * @internal
@@ -138,8 +139,8 @@ class_alias($compatibilityClassName, $className);
      * without actually executing a command (e.g. during composer install)
      *
      * @param string $runLevel
-     * @throws \Helhum\Typo3Console\Exception
-     * @throws \Symfony\Component\Console\Exception\InvalidArgumentException
+     * @throws Exception
+     * @throws InvalidArgumentException
      */
     public function initialize(string $runLevel = null)
     {
@@ -157,8 +158,8 @@ public function initialize(string $runLevel = null)
      * Handle the given command input and return the exit code of the called command
      *
      * @param InputInterface $input
-     * @throws \Helhum\Typo3Console\Exception
-     * @throws \Symfony\Component\Console\Exception\InvalidArgumentException
+     * @throws Exception
+     * @throws InvalidArgumentException
      * @return int
      */
     public function handle(InputInterface $input): int
@@ -167,16 +168,17 @@ public function handle(InputInterface $input): int
 
         $commandCollection = new CommandCollection(
             $this->runLevel,
-            GeneralUtility::makeInstance(PackageManager::class)
+            new CommandConfiguration(GeneralUtility::makeInstance(PackageManager::class))
         );
 
         $application = new Application($this->runLevel, Bootstrap::usesComposerClassLoading());
         $application->setCommandLoader($commandCollection);
 
-        $commandIdentifier = $input->getFirstArgument() ?: '';
-        if ($this->runLevel->isCommandAvailable($commandIdentifier)) {
-            $this->runLevel->runSequenceForCommand($commandIdentifier);
-            $commandCollection->addCommandControllerCommands(GeneralUtility::makeInstance(ObjectManager::class)->get(CommandManager::class));
+        // Try to resolve short command names and aliases
+        $commandName = $commandCollection->find($input->getFirstArgument() ?: 'list');
+        if ($this->runLevel->isCommandAvailable($commandName)) {
+            $this->runLevel->runSequenceForCommand($commandName);
+            $commandCollection->addCommandControllerCommands($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['extbase']['commandControllers'] ?? []);
         }
 
         return $application->run($input);