From 6990454e567a860411931135a838cf1f838cb49c Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Mon, 12 Sep 2016 22:39:44 +0500
Subject: [PATCH] Minor refactoring - Early exit

---
 src/Composer/XdebugHandler.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Composer/XdebugHandler.php b/src/Composer/XdebugHandler.php
index ef8acb9e6..739ffc09c 100644
--- a/src/Composer/XdebugHandler.php
+++ b/src/Composer/XdebugHandler.php
@@ -50,21 +50,18 @@ class XdebugHandler
      */
     public function check()
     {
-        if (!$this->needsRestart()) {
-            $originalIniScanDir = getenv(self::ENV_INI_SCAN_DIR_OLD);
-
-            if ($originalIniScanDir) {
-                putenv(self::ENV_INI_SCAN_DIR_OLD);
-                putenv(self::ENV_INI_SCAN_DIR.'=' . $originalIniScanDir);
-            } else {
-                putenv(self::ENV_INI_SCAN_DIR);
-            }
-
+        if ($this->needsRestart()) {
+            $this->prepareRestart($command) && $this->restart($command);
             return;
         }
 
-        if ($this->prepareRestart($command)) {
-            $this->restart($command);
+        $originalIniScanDir = getenv(self::ENV_INI_SCAN_DIR_OLD);
+
+        if ($originalIniScanDir) {
+            putenv(self::ENV_INI_SCAN_DIR_OLD);
+            putenv(self::ENV_INI_SCAN_DIR . '=' . $originalIniScanDir);
+        } else {
+            putenv(self::ENV_INI_SCAN_DIR);
         }
     }