[Console] The application also catch \Throwable exceptions

Author: lyrixx

Application.php

@@ -79,6 +79,7 @@ class Application implements ResetInterface
 privatestring$version;
 private ?CommandLoaderInterface$commandLoader = null;
 privatebool$catchExceptions = true;
+privatebool$catchErrors = false;
 privatebool$autoExit = true;
 privateInputDefinition$definition;
 privateHelperSet$helperSet;
@@ -172,8 +173,11 @@ public function run(InputInterface $input = null, OutputInterface $output = null
 
 try {
 $exitCode = $this->doRun($input, $output);
- } catch (\Exception$e) {
-if (!$this->catchExceptions) {
+ } catch (\Throwable$e) {
+if ($einstanceof \Exception && !$this->catchExceptions) {
+throw$e;
+ }
+if (!$einstanceof \Exception && !$this->catchErrors) {
 throw$e;
  }
 
@@ -427,6 +431,14 @@ public function setCatchExceptions(bool $boolean)
 $this->catchExceptions = $boolean;
  }
 
+/**
+ * Sets whether to catch errors or not during commands execution.
+ */
+publicfunctionsetCatchErrors(bool$catchErrors = true): void
+ {
+$this->catchErrors = $catchErrors;
+ }
+
 /**
  * Gets whether to automatically exit after a command execution or not.
  */

CHANGELOG.md

@@ -6,6 +6,7 @@ CHANGELOG
 
 * Add `SignalMap` to map signal value to its name
 * Multi-line text in vertical tables is aligned properly
+* The application can also catch errors with `Application::setCatchErrors(true)`
 
 6.3
 ---

Tests/ApplicationTest.php

@@ -771,10 +771,15 @@ public function testFindAmbiguousCommandsIfAllAlternativesAreHidden()
 $this->assertInstanceOf(\FooCommand::class, $application->find('foo:'));
  }
 
-publicfunctiontestSetCatchExceptions()
+/**
+ * @testWith [true]
+ * [false]
+ */
+publicfunctiontestSetCatchExceptions(bool$catchErrors)
  {
 $application = newApplication();
 $application->setAutoExit(false);
+$application->setCatchErrors($catchErrors);
 putenv('COLUMNS=120');
 $tester = newApplicationTester($application);
 
@@ -798,6 +803,33 @@ public function testSetCatchExceptions()
  }
  }
 
+/**
+ * @testWith [true]
+ * [false]
+ */
+publicfunctiontestSetCatchErrors(bool$catchExceptions)
+ {
+$application = newApplication();
+$application->setAutoExit(false);
+$application->setCatchExceptions($catchExceptions);
+$application->add((newCommand('boom'))->setCode(fn () => thrownew \Error('This is an error.')));
+
+putenv('COLUMNS=120');
+$tester = newApplicationTester($application);
+
+try {
+$tester->run(['command' => 'boom']);
+$this->fail('The exception is not catched.');
+ } catch (\Throwable$e) {
+$this->assertInstanceOf(\Error::class, $e);
+$this->assertSame('This is an error.', $e->getMessage());
+ }
+
+$application->setCatchErrors(true);
+$tester->run(['command' => 'boom']);
+$this->assertStringContainsString(' This is an error.', $tester->getDisplay(true));
+ }
+
 publicfunctiontestAutoExitSetting()
  {
 $application = newApplication();