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

Merge pull request #5669 from kamranahmedse/master 

Minor refactoring to `XdebugHandler@check`
pull/5518/merge
Jordi Boggiano 2016-09-12 19:47:40 +02:00 committed by GitHub
parent 2ffa1148a9 6990454e56
commit 2e8ddfb86f
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Composer/XdebugHandler.php
View File

@ -50,21 +50,18 @@ class XdebugHandler
*/ */
public function check() public function check()
{ {
if (!$this->needsRestart()) { if ($this->needsRestart()) {
$originalIniScanDir = getenv(self::ENV_INI_SCAN_DIR_OLD); $this->prepareRestart($command) && $this->restart($command);
if ($originalIniScanDir) {
putenv(self::ENV_INI_SCAN_DIR_OLD);
putenv(self::ENV_INI_SCAN_DIR.'=' . $originalIniScanDir);
} else {
putenv(self::ENV_INI_SCAN_DIR);
}
return; return;
} }
if ($this->prepareRestart($command)) { $originalIniScanDir = getenv(self::ENV_INI_SCAN_DIR_OLD);
$this->restart($command);
if ($originalIniScanDir) {
putenv(self::ENV_INI_SCAN_DIR_OLD);
putenv(self::ENV_INI_SCAN_DIR . '=' . $originalIniScanDir);
} else {
putenv(self::ENV_INI_SCAN_DIR);
} }
} }