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

tentative fix for #5667

pull/5668/head
Rob Bast 2016-09-12 16:08:50 +02:00
parent 754d4fa1b2
commit 547616e96b
No known key found for this signature in database
GPG Key ID: 73076E35E6165F39
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Composer/XdebugHandler.php
View File

@ -49,6 +49,14 @@ class XdebugHandler
public function check() public function check()
{ {
if (!$this->needsRestart()) { if (!$this->needsRestart()) {
$iniScanDir = getenv('PHP_INI_SCAN_DIR_OLD');
if ($iniScanDir) {
putenv('PHP_INI_SCAN_DIR=' . $iniScanDir);
} else {
putenv('PHP_INI_SCAN_DIR');
}
return; return;
} }
@ -204,6 +212,12 @@ class XdebugHandler
if (!file_exists($this->scanDir) && !@mkdir($this->scanDir, 0777)) { if (!file_exists($this->scanDir) && !@mkdir($this->scanDir, 0777)) {
return; return;
} }
$iniScanDirEnv = getenv('PHP_INI_SCAN_DIR');
if ($iniScanDirEnv) {
putenv('PHP_INI_SCAN_DIR_OLD='.$iniScanDirEnv);
}
if (!putenv('PHP_INI_SCAN_DIR='.$this->scanDir)) { if (!putenv('PHP_INI_SCAN_DIR='.$this->scanDir)) {
return; return;
} }