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

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

pull/5669/head
Jordi Boggiano 2016-09-12 16:58:30 +02:00
parent be727a7a6b
commit 8de10dd159
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/XdebugHandler.php
View File

@ -219,6 +219,10 @@ class XdebugHandler
$currentIniScanDir = getenv(self::ENV_INI_SCAN_DIR); $currentIniScanDir = getenv(self::ENV_INI_SCAN_DIR);
if ($currentIniScanDir) { if ($currentIniScanDir) {
putenv(self::ENV_INI_SCAN_DIR_OLD.'='.$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)) { if (!putenv(self::ENV_INI_SCAN_DIR.'='.$this->scanDir)) {