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

Merge branch '1.3'

pull/6010/merge
Jordi Boggiano 2016-12-30 12:46:44 +01:00
parent 77ad36c067 e161218819
commit 033ceb4faa
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Composer/XdebugHandler.php
View File

@ -63,7 +63,10 @@ class XdebugHandler
$args = explode('|', strval(getenv(self::ENV_ALLOW)), 2); $args = explode('|', strval(getenv(self::ENV_ALLOW)), 2);
if ($this->needsRestart($args[0])) { if ($this->needsRestart($args[0])) {
$this->prepareRestart($command) && $this->restart($command); if ($this->prepareRestart()) {
$command = $this->getCommand();
$this->restart($command);
}
return; return;
} }
@ -127,18 +130,15 @@ class XdebugHandler
* - tmp ini file creation * - tmp ini file creation
* - environment variable creation * - environment variable creation
* *
* @param null|string $command The command to run, set by method
*
* @return bool * @return bool
*/ */
private function prepareRestart(&$command) private function prepareRestart()
{ {
$this->tmpIni = ''; $this->tmpIni = '';
$iniPaths = IniHelper::getAll(); $iniPaths = IniHelper::getAll();
$files = $this->getWorkingSet($iniPaths, $replace); $files = $this->getWorkingSet($iniPaths, $replace);
if ($this->writeTmpIni($files, $replace)) { if ($this->writeTmpIni($files, $replace)) {
$command = $this->getCommand();
return $this->setEnvironment($iniPaths); return $this->setEnvironment($iniPaths);
} }
@ -171,6 +171,8 @@ class XdebugHandler
$content .= $this->getIniData($file, $replace); $content .= $this->getIniData($file, $replace);
} }
$content .= PHP_EOL.'memory_limit='.ini_get('memory_limit').PHP_EOL;
return @file_put_contents($this->tmpIni, $content); return @file_put_contents($this->tmpIni, $content);
} }