public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Add support for Application::setCatchErrors in symfony 6.4+, refs symfony/symfony#50420

pull/11581/head
Jordi Boggiano 2023-07-28 19:32:46 +02:00
parent ff70ab7ce9
commit f4738d97b7
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Console/Application.php
View File

@ -87,6 +87,10 @@ class Application extends BaseApplication
public function __construct(string $name = 'Composer', string $version = '')
{
if (method_exists($this, 'setCatchErrors')) {
$this->setCatchErrors(true);
}
static $shutdownRegistered = false;
if ($version === '') {
$version = Composer::getVersion();
@ -395,9 +399,10 @@ class Application extends BaseApplication
$this->hintCommonErrors($e, $output);
// symfony/console does not handle \Error subtypes so we have to renderThrowable ourselves
// symfony/console <6.4 does not handle \Error subtypes so we have to renderThrowable ourselves
// instead of rethrowing those for consumption by the parent class
if (!$e instanceof \Exception) {
// can be removed when Composer supports PHP 8.1+
if (!method_exists($this, 'setCatchErrors') && !$e instanceof \Exception) {
if ($output instanceof ConsoleOutputInterface) {
$this->renderThrowable($e, $output->getErrorOutput());
} else {

3
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -277,6 +277,9 @@ class EventDispatcher
$app = new Application();
$app->setCatchExceptions(false);
if (method_exists($app, 'setCatchErrors')) {
$app->setCatchErrors(false);
}
$app->setAutoExit(false);
$cmd = new $className($event->getName());
$app->add($cmd);

3
tests/Composer/Test/DocumentationTest.php
View File

@ -53,6 +53,9 @@ class DocumentationTest extends TestCase
{
$application = new Application();
$application->setAutoExit(false);
if (method_exists($application, 'setCatchErrors')) {
$application->setCatchErrors(false);
}
$application->setCatchExceptions(false);
$description = new ApplicationDescription($application);

3
tests/Composer/Test/TestCase.php
View File

@ -198,6 +198,9 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
$application = new Application();
$application->setAutoExit(false);
$application->setCatchExceptions(false);
if (method_exists($application, 'setCatchErrors')) {
$application->setCatchErrors(false);
}
return new ApplicationTester($application);
}