[FEATURE] Improve handling of error cases

Fixes: #2

Author: helhum

composer.json

@@ -5,7 +5,7 @@
     "license": "GPL-2.0-or-later",
     "require": {
         "php": "^7.0",
-        "helhum/typo3-console": "^4.9.5 || ^5.0 || ^6.0",
+        "helhum/typo3-console": "^5.8.3 || ^6.0",
         "typo3/cms-composer-installers": "^1.4.2 || ^2.0"
     },
     "autoload": {

src/Composer/InstallerScript/ConsoleCommand.php

@@ -16,9 +16,11 @@
  */
 
 use Composer\Script\Event;
+use Helhum\Typo3Console\Error\ExceptionRenderer;
 use Helhum\Typo3Console\Mvc\Cli\CommandDispatcher;
 use Helhum\Typo3Console\Mvc\Cli\FailedSubProcessCommandException;
 use TYPO3\CMS\Composer\Plugin\Core\InstallerScript;
+use Typo3Console\ComposerAutoCommands\Composer\ConsoleIo;
 
 class ConsoleCommand implements InstallerScript
 {
@@ -42,26 +44,35 @@ class ConsoleCommand implements InstallerScript
      */
     private $shouldRun;
 
+    /**
+     * @var bool
+     */
+    private $allowFailure;
+
+    private static $verbosityHint = true;
+
     public function __construct(
         string $command,
         array $arguments = [],
         string $message = '',
-        callable $shouldRun = null
+        callable $shouldRun = null,
+        bool $allowFailure = true
     ) {
         $this->command = $command;
         $this->arguments = $arguments;
         $this->message = $message;
-        $this->shouldRun = $shouldRun ?: function () {
+        $this->shouldRun = $shouldRun ?? function () {
             return true;
         };
+        $this->allowFailure = $allowFailure;
     }
 
     public function run(Event $event): bool
     {
         if (!($this->shouldRun)()) {
             return true;
         }
-        $io = $event->getIO();
+        $io = new ConsoleIo($event->getIO());
         if ($this->message) {
             $io->writeError(sprintf('<info>%s</info>', $this->message));
         }
@@ -71,34 +82,23 @@ public function run(Event $event): bool
             $output = $commandDispatcher->executeCommand($this->command, $this->arguments);
             $io->writeError($output, true, $io::VERBOSE);
         } catch (FailedSubProcessCommandException $e) {
-            $io->writeError(sprintf('<error>Executing TYPO3 Console command "%s" returned with error code %d.</error>', $e->getCommand(), $e->getExitCode()));
-            $io->writeError(
-                sprintf(
-                    "Command line:\n%s\n",
-                    $e->getCommandLine()
-                ),
-                true,
-                $io::VERBOSE
-            );
-            if ($commandOutput = trim(strip_tags($e->getOutputMessage()))) {
-                $io->writeError(
-                    sprintf(
-                        "Command output:\n%s\n",
-                        $commandOutput
-                    ),
-                    true,
-                    $io::VERBOSE
-                );
+            if (!$this->allowFailure) {
+                throw $e;
             }
-            if ($commandErrorOutput = trim(strip_tags($e->getErrorMessage()))) {
-                $io->writeError(
-                    sprintf(
-                        "Command error output:\n%s\n",
-                        $commandErrorOutput
-                    ),
-                    true,
-                    $io::VERBOSE
+            if (!$this->allowFailure || $io->getOutput()->isVerbose()) {
+                (new ExceptionRenderer())->render($e, $io->getOutput());
+            } else {
+                $messages[] = sprintf(
+                    '<error>Executing TYPO3 Console command "%s" failed.</error>',
+                    $e->getCommand()
                 );
+                if (self::$verbosityHint) {
+                    $messages[] = sprintf(
+                        '<info>For details re-run Composer command with increased verbosity (-vvv).</info>'
+                    );
+                    self::$verbosityHint = false;
+                }
+                $io->writeError($messages);
             }
         }
 

src/Composer/InstallerScripts.php

@@ -32,11 +32,11 @@ class InstallerScripts implements InstallerScriptsRegistration
     public static function register(Event $event, ScriptDispatcher $scriptDispatcher)
     {
         $scriptDispatcher->addInstallerScript(
-            new ConsoleCommand('install:generatepackagestates'),
+            new ConsoleCommand('install:generatepackagestates', [], '', null, false),
             20
         );
         $scriptDispatcher->addInstallerScript(
-            new ConsoleCommand('install:fixfolderstructure'),
+            new ConsoleCommand('install:fixfolderstructure', [], '', null, false),
             20
         );
         $typo3IsSetUp = getenv('TYPO3_IS_SET_UP') || file_exists(getenv('TYPO3_PATH_ROOT') . '/typo3conf/LocalConfiguration.php');