From 8eaae9f50a953a4a7f38c9571e3925ddfadff05d Mon Sep 17 00:00:00 2001 From: Ben Beckford Date: Tue, 26 Jan 2021 20:48:19 +0000 Subject: [PATCH 1/2] Suppress error when chdir($oldWorkingDir); unsuccessful resolves #9649 --- src/Composer/Console/Application.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index 76629d9c4..8684ea3ed 100644 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -309,8 +309,11 @@ class Application extends BaseApplication $result = parent::doRun($input, $output); + // chdir back to $oldWorkingDir if set if (isset($oldWorkingDir)) { - chdir($oldWorkingDir); + Silencer::call(function () use ($oldWorkingDir) { + chdir($oldWorkingDir); + }); } if (isset($startTime)) { From 4e0b8c108618ea5e260a61ab13108829e6792413 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 27 Jan 2021 09:17:25 +0100 Subject: [PATCH 2/2] Update src/Composer/Console/Application.php --- src/Composer/Console/Application.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index 8684ea3ed..9d3557e27 100644 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -311,9 +311,7 @@ class Application extends BaseApplication // chdir back to $oldWorkingDir if set if (isset($oldWorkingDir)) { - Silencer::call(function () use ($oldWorkingDir) { - chdir($oldWorkingDir); - }); + Silencer::call('chdir', $oldWorkingDir); } if (isset($startTime)) {