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

Merge pull request #6037 from johnstevenson/xdebug-logic 

Fix scanned ini files logic
pull/6053/head
Jordi Boggiano 2017-01-04 09:32:58 +01:00 committed by GitHub
parent 31731a06c2 d48d11d187
commit 452dd4b05e
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 = '';
$iniPaths = IniHelper::getAll();
$additional = count($iniPaths) > 1;
if (empty($iniPaths[0])) {
// There is no loaded ini
@ -143,7 +144,7 @@ class XdebugHandler
}
if ($this->writeTmpIni($iniPaths)) {
return $this->setEnvironment($iniPaths);
return $this->setEnvironment($additional, $iniPaths);
}
return false;
@ -193,15 +194,14 @@ class XdebugHandler
/**
* 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
*
* @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
$additional = count($iniPaths) > 1;
if ($additional && !putenv('PHP_INI_SCAN_DIR=')) {
return false;
}