Merge branch 'develop' into patch-2

Author: repejota

src/Nats/Connection.php

@@ -209,16 +209,19 @@ private function getStream($address, $timeout)
         $errno = null;
         $errstr = null;
 
+        set_error_handler(function(){return true;});
         $fp = stream_socket_client($address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT);
-        $timeout = number_format($timeout, 3);
-        $seconds = floor($timeout);
-        $microseconds = ($timeout - $seconds) * 1000;
-        stream_set_timeout($fp, $seconds, $microseconds);
+        restore_error_handler();
 
         if (!$fp) {
             throw new \Exception($errstr, $errno);
         }
 
+        $timeout = number_format($timeout, 3);
+        $seconds = floor($timeout);
+        $microseconds = ($timeout - $seconds) * 1000;
+        stream_set_timeout($fp, $seconds, $microseconds);
+
         return $fp;
     }
 
@@ -506,6 +509,9 @@ public function setChunkSize($chunkSize)
      */
     public function close()
     {
+        if ($this->streamSocket === null) {
+            return;
+        }
         fclose($this->streamSocket);
         $this->streamSocket = null;
     }

test/ConnectionTest.php

@@ -205,4 +205,23 @@ function ($res) {
 
         $this->assertTrue(true);
     }
+
+
+    /**
+     * Test Connecting when nats server is not available
+     *
+     * @return void
+     */
+    public function testRefusedConnection()
+    {
+        $this->setExpectedException(\Exception::class);
+
+        $options = new ConnectionOptions();
+        $options->setHost('localhost');
+        $options->setPort(4223);
+
+        $c = new Nats\Connection($options);
+        $c->connect();
+        $this->assertFalse($this->c->isConnected());
+    }
 }