Merge pull request #5669 from kamranahmedse/master

Minor refactoring to `XdebugHandler@check`
8 years ago · 2e8ddfb86f
parent 2ffa1148a9 6990454e56
commit 2e8ddfb86f
1 changed files with 9 additions and 12 deletions
--- a/src/Composer/XdebugHandler.php
+++ b/src/Composer/XdebugHandler.php
@ -50,22 +50,19 @@ class XdebugHandler
     */
    public function check()
    {
-        if (!$this->needsRestart()) {
+        if ($this->needsRestart()) {
+            $this->prepareRestart($command) && $this->restart($command);
+            return;
+        }
+
        $originalIniScanDir = getenv(self::ENV_INI_SCAN_DIR_OLD);

        if ($originalIniScanDir) {
            putenv(self::ENV_INI_SCAN_DIR_OLD);
-                putenv(self::ENV_INI_SCAN_DIR.'=' . $originalIniScanDir);
+            putenv(self::ENV_INI_SCAN_DIR . '=' . $originalIniScanDir);
        } else {
            putenv(self::ENV_INI_SCAN_DIR);
        }
-
-            return;
-        }
-
-        if ($this->prepareRestart($command)) {
-            $this->restart($command);
-        }
    }

    /**