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

Fix bug setting COMPOSER_ORIGINAL_INIS 

This variable stores the loaded ini file and any additional scanned ini
files, separated by a path-separator. The loaded ini file should always
be present, even if it is an empty value. Unfortunately I removed any
empty value to parse the ini files, then used the truncated list to set
the variable.

This bug surfaced on docker php images. These do not have a specific
php.ini but store all their settings in the location(s) configured at
build time using --with-config-file-scan-dir.
pull/6779/merge
johnstevenson 2017-11-02 13:53:09 +00:00 committed by Jordi Boggiano
parent 02b57ff4a2
commit b1aed48e1a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Composer/XdebugHandler.php
View File

@ -139,11 +139,6 @@ class XdebugHandler
$iniPaths = IniHelper::getAll(); $iniPaths = IniHelper::getAll();
$additional = count($iniPaths) > 1; $additional = count($iniPaths) > 1;
if (empty($iniPaths[0])) {
// There is no loaded ini
array_shift($iniPaths);
}
if ($this->writeTmpIni($iniPaths)) { if ($this->writeTmpIni($iniPaths)) {
return $this->setEnvironment($additional, $iniPaths); return $this->setEnvironment($additional, $iniPaths);
} }
@ -156,20 +151,25 @@ class XdebugHandler
* *
* The filename is passed as the -c option when the process restarts. * The filename is passed as the -c option when the process restarts.
* *
* @param array $iniFiles The php.ini locations * @param array $iniPaths Locations reported by the current process
* *
* @return bool * @return bool
*/ */
private function writeTmpIni(array $iniFiles) private function writeTmpIni(array $iniPaths)
{ {
if (!$this->tmpIni = tempnam(sys_get_temp_dir(), '')) { if (!$this->tmpIni = tempnam(sys_get_temp_dir(), '')) {
return false; return false;
} }
// $iniPaths has at least one item and it may be empty
if (empty($iniPaths[0])) {
array_shift($iniPaths);
}
$content = ''; $content = '';
$regex = '/^\s*(zend_extension\s*=.*xdebug.*)$/mi'; $regex = '/^\s*(zend_extension\s*=.*xdebug.*)$/mi';
foreach ($iniFiles as $file) { foreach ($iniPaths as $file) {
$data = preg_replace($regex, ';$1', file_get_contents($file)); $data = preg_replace($regex, ';$1', file_get_contents($file));
$content .= $data.PHP_EOL; $content .= $data.PHP_EOL;
} }
@ -203,7 +203,7 @@ 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 bool $additional Whether there were additional inis
* @param array $iniPaths Locations used by the current prcoess * @param array $iniPaths Locations reported by the current process
* *
* @return bool * @return bool
*/ */