Tweak logic in case of dirty state start-up, refs #5668

8 years ago · 8de10dd159
parent be727a7a6b
commit 8de10dd159
1 changed files with 4 additions and 0 deletions
--- a/src/Composer/XdebugHandler.php
+++ b/src/Composer/XdebugHandler.php
@ -219,6 +219,10 @@ class XdebugHandler
            $currentIniScanDir = getenv(self::ENV_INI_SCAN_DIR);
            if ($currentIniScanDir) {
                putenv(self::ENV_INI_SCAN_DIR_OLD.'='.$currentIniScanDir);
+            } else {
+                // make sure the env var does not exist if none is to be set
+                // otherwise the child process will reset it incorrectly
+                putenv(self::ENV_INI_SCAN_DIR_OLD);
            }

            if (!putenv(self::ENV_INI_SCAN_DIR.'='.$this->scanDir)) {