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

Fix scanned ini files logic

pull/6037/head
johnstevenson 2017-01-03 19:55:19 +00:00
parent 31731a06c2
commit d48d11d187
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/XdebugHandler.php
View File

@ -136,6 +136,7 @@ class XdebugHandler
{ {
$this->tmpIni = ''; $this->tmpIni = '';
$iniPaths = IniHelper::getAll(); $iniPaths = IniHelper::getAll();
$additional = count($iniPaths) > 1;
if (empty($iniPaths[0])) { if (empty($iniPaths[0])) {
// There is no loaded ini // There is no loaded ini
@ -143,7 +144,7 @@ class XdebugHandler
} }
if ($this->writeTmpIni($iniPaths)) { if ($this->writeTmpIni($iniPaths)) {
return $this->setEnvironment($iniPaths); return $this->setEnvironment($additional, $iniPaths);
} }
return false; return false;
@ -193,15 +194,14 @@ class XdebugHandler
/** /**
* Returns true if the restart environment variables were set * Returns true if the restart environment variables were set
* *
* @param bool $additional Whether there were additional inis
* @param array $iniPaths Locations used by the current prcoess * @param array $iniPaths Locations used by the current prcoess
* *
* @return bool * @return bool
*/ */
private function setEnvironment(array $iniPaths) private function setEnvironment($additional, array $iniPaths)
{ {
// Set scan dir to an empty value if additional ini files were used // Set scan dir to an empty value if additional ini files were used
$additional = count($iniPaths) > 1;
if ($additional && !putenv('PHP_INI_SCAN_DIR=')) { if ($additional && !putenv('PHP_INI_SCAN_DIR=')) {
return false; return false;
} }