Merge pull request #5669 from kamranahmedse/master

Minor refactoring to `XdebugHandler@check`
main
Jordi Boggiano 8 years ago committed by GitHub
commit 2e8ddfb86f

@ -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);
} }
} }

Loading…
Cancel
Save