TYPO3-Console · helhum · Dec 8, 2018 · Dec 8, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,10 @@
 /.Build/*
 /Classes/Console/Hook/*
-/Configuration/Console/ComposerPackagesCommands.php
+/Configuration/ComposerPackagesCommands.php
 /Libraries/vendor
 /Resources/Public/*
 
 /.php_cs.cache
 /composer.lock
 /ext_*
-*GENERATED*
+*GENERATED*
diff --git a/Classes/Console/Composer/InstallerScript/PopulateCommandConfiguration.php b/Classes/Console/Composer/InstallerScript/PopulateCommandConfiguration.php
@@ -49,11 +49,14 @@ public function run(ScriptEvent $event): bool
                 // Since meta packages have no code, thus cannot include any commands, we ignore them as well.
                 continue;
             }
-            $commandConfiguration = array_merge($commandConfiguration, $this->getConfigFromPackage($installPath, $packageName));
+            $packageConfig = $this->getConfigFromPackage($installPath, $packageName);
+            if ($packageConfig !== []) {
+                $commandConfiguration[] = $packageConfig;
+            }
         }
 
         $success = file_put_contents(
-            __DIR__ . '/../../../../Configuration/Console/ComposerPackagesCommands.php',
+            __DIR__ . '/../../../../Configuration/ComposerPackagesCommands.php',
             '<?php' . chr(10)
             . 'return '
             . var_export($commandConfiguration, true)
@@ -86,6 +89,7 @@ private function getConfigFromPackage(string $installPath, string $packageName):
     {
         $commandConfiguration = [];
         if (file_exists($commandConfigurationFile = $installPath . '/Configuration/Console/Commands.php')) {
+            trigger_error($packageName . ': Configuration/Console/Commands.php for registering commands is deprecated and will be removed with 6.0. Register Symfony commands in Configuration/Commands.php instead.', E_USER_DEPRECATED);
             $commandConfiguration = require $commandConfigurationFile;
         }
         if (file_exists($commandConfigurationFile = $installPath . '/Configuration/Commands.php')) {
@@ -96,6 +100,6 @@ private function getConfigFromPackage(string $installPath, string $packageName):
         }
         CommandConfiguration::ensureValidCommandRegistration($commandConfiguration, $packageName);
 
-        return [$packageName => CommandConfiguration::unifyCommandConfiguration($commandConfiguration, $packageName)];
+        return CommandConfiguration::unifyCommandConfiguration($commandConfiguration, $packageName);
     }
 }
diff --git a/Classes/Console/Core/Booting/Sequence.php b/Classes/Console/Core/Booting/Sequence.php
@@ -84,6 +84,7 @@ public function removeStep($stepIdentifier)
      * Executes all steps of this sequence
      *
      * @param Bootstrap $bootstrap
+     * @throws StepFailedException
      * @return void
      */
     public function invoke(Bootstrap $bootstrap)

diff --git a/Classes/Console/Error/ExceptionHandler.php b/Classes/Console/Error/ExceptionHandler.php
@@ -28,16 +28,10 @@ class ExceptionHandler
      */
     protected $output;
 
-    /**
-     * @param ConsoleOutput $output
-     */
     public function __construct(ExceptionRenderer $exceptionRenderer = null, ConsoleOutput $output = null)
     {
         $this->exceptionRenderer = $exceptionRenderer ?: new ExceptionRenderer();
-        if ($output === null) {
-            $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_DEBUG);
-        }
-        $this->output = $output;
+        $this->output = $output ?? new ConsoleOutput(ConsoleOutput::VERBOSITY_DEBUG);
     }
 
     /**

diff --git a/Classes/Console/Mvc/Cli/CommandCollection.php b/Classes/Console/Mvc/Cli/CommandCollection.php
@@ -53,6 +53,11 @@ class CommandCollection implements CommandLoaderInterface
      */
     private $commands = [];
 
+    /**
+     * @var string[]
+     */
+    private $replaces = [];
+
     public function __construct(RunLevel $runLevel, CommandConfiguration $commandConfiguration)
     {
         $this->runLevel = $runLevel;
@@ -106,11 +111,11 @@ public function get($name): BaseCommand
             throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name), [], 1518812618);
         }
         $commandConfig = $this->commands[$name];
-        if (isset($commandConfig['class'])) {
+        if (isset($commandConfig['controller'])) {
+            $command = GeneralUtility::makeInstance(CommandControllerCommand::class, $commandConfig['name'], new Command($commandConfig['controller'], $commandConfig['controllerCommandName']), $commandConfig['lateCommand'] ?? false);
+        } elseif (isset($commandConfig['class'])) {
             /** @var BaseCommand $command */
             $command = GeneralUtility::makeInstance($commandConfig['class'], $commandConfig['name']);
-        } elseif (isset($commandConfig['controller'])) {
-            $command = GeneralUtility::makeInstance(CommandControllerCommand::class, $commandConfig['name'], new Command($commandConfig['controller'], $commandConfig['controllerCommandName']));
         } else {
             throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $name), [], 1520205204);
         }
@@ -155,9 +160,22 @@ private function isCommandAvailable(string $name): bool
 
     private function populateCommands(array $definitions = null)
     {
-        foreach ($definitions ?? $this->commandConfiguration->getCommandDefinitions() as $nameSpacedName => $commandConfig) {
-            $this->add($nameSpacedName, $commandConfig);
+        $definitions = $definitions ?? $this->commandConfiguration->getCommandDefinitions();
+        $this->extractReplaces($definitions);
+        foreach ($definitions as $commandConfig) {
+            $this->add($commandConfig);
+        }
+    }
+
+    private function extractReplaces(array $definitions)
+    {
+        $replaces = [];
+        foreach ($definitions as $commandConfiguration) {
+            if (isset($commandConfiguration['replace'])) {
+                $replaces[] = $commandConfiguration['replace'];
+            }
         }
+        $this->replaces = array_merge($this->replaces, ...$replaces);
     }
 
     private function initializeRunLevel()
@@ -174,25 +192,24 @@ private function initializeRunLevel()
         }
     }
 
-    private function add(string $nameSpacedName, array $commandConfig)
+    private function add(array $commandConfig)
     {
         $finalCommandName = $commandConfig['name'];
-        $replaces = $this->commandConfiguration->getReplaces();
-        if (in_array($commandConfig['name'], $replaces, true)
-            || in_array($nameSpacedName, $replaces, true)
+        if (in_array($commandConfig['name'], $this->replaces, true)
+            || in_array($commandConfig['nameSpacedName'], $this->replaces, true)
         ) {
             return;
         }
         if (isset($this->commands[$finalCommandName])) {
-            $finalCommandName = $nameSpacedName;
+            $finalCommandName = $commandConfig['nameSpacedName'];
         }
         if (isset($this->commands[$finalCommandName])) {
             throw new CommandNameAlreadyInUseException('Command "' . $finalCommandName . '" registered by "' . $commandConfig['vendor'] . '" is already in use', 1506531326);
         }
         $commandConfig['aliases'] = $commandConfig['aliases'] ?? [];
-        if ($finalCommandName !== $nameSpacedName) {
+        if ($finalCommandName !== $commandConfig['nameSpacedName']) {
             // Add alias to be able to call this command always with name spaced command name
-            $commandConfig['aliases'][] = $nameSpacedName;
+            $commandConfig['aliases'][] = $commandConfig['nameSpacedName'];
         }
         $commandConfig['name'] = $finalCommandName;
         $this->commands[$finalCommandName] = $commandConfig;

diff --git a/Classes/Console/Mvc/Cli/CommandConfiguration.php b/Classes/Console/Mvc/Cli/CommandConfiguration.php
@@ -15,7 +15,6 @@
  */
 
 use Symfony\Component\Console\Exception\RuntimeException;
-use TYPO3\CMS\Core\Console\CommandNameAlreadyInUseException;
 use TYPO3\CMS\Core\Package\PackageInterface;
 use TYPO3\CMS\Core\Package\PackageManager;
 
@@ -29,8 +28,6 @@ class CommandConfiguration
      */
     private $packageManager;
 
-    private $replaces = [];
-
     private $commandDefinitions = [];
 
     public function __construct(PackageManager $packageManager)
@@ -60,40 +57,43 @@ public static function ensureValidCommandRegistration($commandConfiguration, $pa
 
     public static function unifyCommandConfiguration(array $commandConfiguration, string $packageName): array
     {
-        $commandDefinitions = array_replace($commandConfiguration['commands'] ?? [], self::extractCommandDefinitionsFromControllers($commandConfiguration['controllers'] ?? []));
+        $commandDefinitions = [];
 
-        foreach ($commandDefinitions as $commandName => $commandConfig) {
-            $commandDefinitions[$commandName]['vendor'] = $vendor = $commandConfig['vendor'] ?? $packageName;
+        foreach ($commandConfiguration['commands'] ?? [] as $commandName => $commandConfig) {
+            $vendor = $commandConfig['vendor'] ?? $packageName;
             $nameSpacedCommandName = $vendor . ':' . $commandName;
+            $commandConfig['vendor'] = $vendor;
+            $commandConfig['name'] = $commandName;
+            $commandConfig['nameSpacedName'] = $nameSpacedCommandName;
             $nameSpacedCommandCollection = $nameSpacedCommandName;
             if (strrpos($commandName, ':') !== false) {
                 $nameSpacedCommandCollection = $vendor . ':' . substr($commandName, 0, strrpos($commandName, ':')) . ':*';
             }
             if (isset($commandConfiguration['runLevels'][$nameSpacedCommandCollection])) {
-                $commandDefinitions[$commandName]['runLevel'] = $commandConfiguration['runLevels'][$nameSpacedCommandCollection];
+                $commandConfig['runLevel'] = $commandConfiguration['runLevels'][$nameSpacedCommandCollection];
             }
             if (isset($commandConfiguration['runLevels'][$commandName])) {
-                $commandDefinitions[$commandName]['runLevel'] = $commandConfiguration['runLevels'][$commandName];
+                $commandConfig['runLevel'] = $commandConfiguration['runLevels'][$commandName];
             }
             if (isset($commandConfiguration['runLevels'][$nameSpacedCommandName])) {
-                $commandDefinitions[$commandName]['runLevel'] = $commandConfiguration['runLevels'][$nameSpacedCommandName];
+                $commandConfig['runLevel'] = $commandConfiguration['runLevels'][$nameSpacedCommandName];
             }
             if (isset($commandConfiguration['bootingSteps'][$commandName])) {
-                $commandDefinitions[$commandName]['bootingSteps'] = $commandConfiguration['bootingSteps'][$commandName];
+                $commandConfig['bootingSteps'] = $commandConfiguration['bootingSteps'][$commandName];
             }
             if (isset($commandConfiguration['bootingSteps'][$nameSpacedCommandName])) {
-                $commandDefinitions[$commandName]['bootingSteps'] = $commandConfiguration['bootingSteps'][$nameSpacedCommandName];
+                $commandConfig['bootingSteps'] = $commandConfiguration['bootingSteps'][$nameSpacedCommandName];
             }
+            $commandDefinitions[] = $commandConfig;
         }
         if (isset($commandConfiguration['replace'])) {
-            $anyCommandName = key($commandDefinitions);
-            $commandDefinitions[$anyCommandName]['replace'] = array_merge($commandDefinitions[$anyCommandName]['replace'] ?? [], $commandConfiguration['replace']);
+            $commandDefinitions[0]['replace'] = array_merge($commandDefinitions[0]['replace'] ?? [], $commandConfiguration['replace']);
         }
 
-        return $commandDefinitions;
+        return array_replace($commandDefinitions, self::extractCommandDefinitionsFromControllers($commandConfiguration['controllers'] ?? [], $packageName === '_lateCommands'));
     }
 
-    private static function extractCommandDefinitionsFromControllers(array $controllers): array
+    private static function extractCommandDefinitionsFromControllers(array $controllers, bool $lateCommand): array
     {
         $commandDefinitions = [];
         foreach ($controllers as $controllerClassName) {
@@ -113,24 +113,22 @@ private static function extractCommandDefinitionsFromControllers(array $controll
                     $vendor = \TYPO3\CMS\Core\Utility\GeneralUtility::camelCaseToLowerCaseUnderscored($classNameParts[1]);
                     $controllerCommandNameSpace = strtolower(substr($classNameParts[$numberOfClassNameParts - 1], 0, -17));
                     $commandName = $controllerCommandNameSpace . ':' . strtolower($controllerCommandName);
-                    $commandDefinitions[$commandName]['vendor'] = $vendor;
-                    $commandDefinitions[$commandName]['controller'] = $controllerClassName;
-                    $commandDefinitions[$commandName]['controllerCommandName'] = $controllerCommandName;
+                    $namespacedCommandName = $vendor . ':' . $commandName;
+                    $commandDefinitions[] = [
+                        'vendor' => $vendor,
+                        'name' => $commandName,
+                        'nameSpacedName' => $namespacedCommandName,
+                        'controller' => $controllerClassName,
+                        'controllerCommandName' => $controllerCommandName,
+                        'lateCommand' => $lateCommand,
+                    ];
                 }
             }
         }
 
         return $commandDefinitions;
     }
 
-    /**
-     * @return array
-     */
-    public function getReplaces(): array
-    {
-        return $this->replaces;
-    }
-
     /**
      * @return array
      */
@@ -141,55 +139,43 @@ public function getCommandDefinitions(): array
 
     public function addCommandControllerCommands(array $commandControllers): array
     {
-        $addedCommandDefinitions = $this->getCommandDefinitionsForCommands(self::unifyCommandConfiguration(['controllers' => $commandControllers], ''));
-        $this->commandDefinitions = array_replace($this->commandDefinitions, $addedCommandDefinitions);
+        $addedCommandDefinitions = self::unifyCommandConfiguration(['controllers' => $commandControllers], '_lateCommands');
+        $this->commandDefinitions = array_merge($this->commandDefinitions, $addedCommandDefinitions);
+
+        if (!empty($addedCommandDefinitions)) {
+            trigger_error('Registering commands via $GLOBALS[\'TYPO3_CONF_VARS\'][\'SC_OPTIONS\'][\'extbase\'][\'commandControllers\'] is deprecated and will be removed with 6.0. Register Symfony commands in Configuration/Commands.php instead.', E_USER_DEPRECATED);
+        }
 
         return $addedCommandDefinitions;
     }
 
     private function initialize()
     {
-        foreach ($this->gatherRawConfig() as $commandConfiguration) {
-            $this->commandDefinitions = array_replace($this->commandDefinitions, $this->getCommandDefinitionsForCommands($commandConfiguration));
-        }
-    }
-
-    private function getCommandDefinitionsForCommands(array $commands): array
-    {
-        $commandDefinitions = [];
-        foreach ($commands as $name => $singleCommandConfiguration) {
-            $vendor = $singleCommandConfiguration['vendor'];
-            if (isset($singleCommandConfiguration['replace'])) {
-                $this->replaces = array_merge($this->replaces, $singleCommandConfiguration['replace']);
-            }
-            $singleCommandConfiguration['name'] = $name;
-            $nameSpacedCommandName = $vendor . ':' . $name;
-            if (isset($this->commandDefinitions[$nameSpacedCommandName])) {
-                throw new CommandNameAlreadyInUseException('Command "' . $nameSpacedCommandName . '" registered by "' . $vendor . '" is already in use', 1520181870);
-            }
-            $commandDefinitions[$nameSpacedCommandName] = $singleCommandConfiguration;
-        }
-
-        return $commandDefinitions;
+        $this->commandDefinitions = array_merge([], ...$this->gatherRawConfig());
     }
 
     /**
      * @return array
      */
     private function gatherRawConfig(): array
     {
-        if (file_exists($commandConfigurationFile = __DIR__ . '/../../../../Configuration/Console/ComposerPackagesCommands.php')) {
+        if (file_exists($commandConfigurationFile = __DIR__ . '/../../../../Configuration/ComposerPackagesCommands.php')) {
             $configuration = require $commandConfigurationFile;
         } else {
             // We only reach this point in non composer mode
             // We ensure that our commands are present, even if we are not an active extension or even not being an extension at all
-            $configuration['typo3_console'] = self::unifyCommandConfiguration(require __DIR__ . '/../../../../Configuration/Console/Commands.php', 'typo3_console');
+            $configuration[] = require __DIR__ . '/../../../../Configuration/Commands.php';
         }
         foreach ($this->packageManager->getActivePackages() as $package) {
+            if ($package->getPackageKey() === 'typo3_console') {
+                // We only reach this point in non composer mode
+                // We registered our commands above already
+                continue;
+            }
             $packageConfig = $this->getConfigFromExtension($package);
             if (!empty($packageConfig)) {
                 self::ensureValidCommandRegistration($packageConfig, $package->getPackageKey());
-                $configuration[$package->getPackageKey()] = self::unifyCommandConfiguration($packageConfig, $package->getPackageKey());
+                $configuration[] = self::unifyCommandConfiguration($packageConfig, $package->getPackageKey());
             }
         }
 
@@ -200,6 +186,7 @@ private function getConfigFromExtension(PackageInterface $package): array
     {
         $commandConfiguration = [];
         if (file_exists($commandConfigurationFile = $package->getPackagePath() . 'Configuration/Console/Commands.php')) {
+            trigger_error('Configuration/Console/Commands.php for registering commands is deprecated and will be removed with 6.0. Register Symfony commands in Configuration/Commands.php instead.', E_USER_DEPRECATED);
             $commandConfiguration = require $commandConfigurationFile;
         }
         if (file_exists($commandConfigurationFile = $package->getPackagePath() . 'Configuration/Commands.php')) {

diff --git a/Classes/Console/Mvc/Cli/Symfony/Command/CommandControllerCommand.php b/Classes/Console/Mvc/Cli/Symfony/Command/CommandControllerCommand.php
@@ -35,6 +35,7 @@
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -60,10 +61,24 @@ class CommandControllerCommand extends Command
      */
     private $application;
 
-    public function __construct($name, CommandDefinition $commandDefinition)
+    /**
+     * @var bool
+     */
+    private $isLateCommand;
+
+    public function __construct($name, CommandDefinition $commandDefinition, bool $isLateCommand = false)
     {
         $this->commandDefinition = $commandDefinition;
         parent::__construct($name);
+        $this->isLateCommand = $isLateCommand;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isLateCommand(): bool
+    {
+        return $this->isLateCommand;
     }
 
     public function getNativeDefinition()
@@ -155,9 +170,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         // @deprecated in 5.0 will be removed in 6.0
         $givenCommandName = $input->getArgument('command');
+        $debugOutput = $output;
+        if ($output instanceof ConsoleOutput) {
+            $debugOutput = $output->getErrorOutput();
+        }
         if ($givenCommandName === $this->getAliases()[0]) {
-            $output->writeln('<warning>Specifying the full command name is deprecated.</warning>');
-            $output->writeln(sprintf('<warning>Please use "%s" as command name instead.</warning>', $this->getName()));
+            $debugOutput->writeln('<warning>Specifying the full command name is deprecated.</warning>');
+            $debugOutput->writeln(sprintf('<warning>Please use "%s" as command name instead.</warning>', $this->getName()));
+        }
+        if ($this->isLateCommand && $output->isVerbose()) {
+            $debugOutput->writeln('<warning>Registering commands via $GLOBALS[\'TYPO3_CONF_VARS\'][\'SC_OPTIONS\'][\'extbase\'][\'commandControllers\'] is deprecated and will be removed with 6.0. Register Symfony commands in Configuration/Commands.php instead.</warning>');
         }
         $response = (new RequestHandler())->handle($this->commandDefinition, $input, $output);