Consistent CS to return early

reactphp · clue · Jan 27, 2017 · Jan 8, 2017 · Jan 9, 2017 · Jan 23, 2017
commit 99bbf2e8e356c6f433eaca14b768323834cb5f51
diff --git a/src/Connection.php b/src/Connection.php
@@ -16,12 +16,14 @@ class Connection extends Stream implements ConnectionInterface
 {
     public function handleClose()
     {
-        if (is_resource($this->stream)) {
-            // http://chat.stackoverflow.com/transcript/message/7727858#7727858
-            stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
-            stream_set_blocking($this->stream, false);
-            fclose($this->stream);
+        if (!is_resource($this->stream)) {
+            return;
         }
+
+        // http://chat.stackoverflow.com/transcript/message/7727858#7727858
+        stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
+        stream_set_blocking($this->stream, false);
+        fclose($this->stream);
     }
 
     public function getRemoteAddress()

diff --git a/src/Server.php b/src/Server.php
@@ -141,11 +141,13 @@ public function getPort()
 
     public function shutdown()
     {
-        if (is_resource($this->master)) {
-            $this->loop->removeStream($this->master);
-            fclose($this->master);
-            $this->removeAllListeners();
+        if (!is_resource($this->master)) {
+            return;
         }
+
+        $this->loop->removeStream($this->master);
+        fclose($this->master);
+        $this->removeAllListeners();
     }
 
     public function createConnection($socket)