From 13421f7d66ae8e824e9b821f2aee75772284cbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Mirtes?= Date: Fri, 26 Aug 2022 15:01:28 +0200 Subject: [PATCH] Config - always respect COMPOSER_DISCARD_CHANGES --- src/Composer/Config.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Composer/Config.php b/src/Composer/Config.php index 141efa6ff01f..8d132bb7c068 100644 --- a/src/Composer/Config.php +++ b/src/Composer/Config.php @@ -376,7 +376,8 @@ public function get(string $key, int $flags = 0) return $value; case 'discard-changes': - if ($env = $this->getComposerEnv('COMPOSER_DISCARD_CHANGES')) { + $env = $this->getComposerEnv('COMPOSER_DISCARD_CHANGES'); + if ($env !== false) { if (!in_array($env, ['stash', 'true', 'false', '1', '0'], true)) { throw new \RuntimeException( "Invalid value for COMPOSER_DISCARD_CHANGES: {$env}. Expected 1, 0, true, false or stash" @@ -519,7 +520,7 @@ private function realpath(string $path): string * This should be used to read COMPOSER_ environment variables * that overload config values. * - * @return string|bool + * @return string|false */ private function getComposerEnv(string $var) {