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

Use finally to restore error handler after command runs

pull/10430/head
Jordi Boggiano 2022-01-04 16:19:58 +01:00
parent 99fa6116f9
commit 711f436b24
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,8 +338,6 @@ class Application extends BaseApplication
$io->writeError('<info>Memory usage: '.round(memory_get_usage() / 1024 / 1024, 2).'MiB (peak: '.round(memory_get_peak_usage() / 1024 / 1024, 2).'MiB), time: '.round(microtime(true) - $startTime, 2).'s'); $io->writeError('<info>Memory usage: '.round(memory_get_usage() / 1024 / 1024, 2).'MiB (peak: '.round(memory_get_peak_usage() / 1024 / 1024, 2).'MiB), time: '.round(microtime(true) - $startTime, 2).'s');
} }
restore_error_handler();
return $result; return $result;
} catch (ScriptExecutionException $e) { } catch (ScriptExecutionException $e) {
return (int) $e->getCode(); return (int) $e->getCode();
@ -349,9 +347,9 @@ class Application extends BaseApplication
$this->hintCommonErrors($e); $this->hintCommonErrors($e);
restore_error_handler();
throw $e; throw $e;
} finally {
restore_error_handler();
} }
} }