Merge branch 'release/0.6.0'

Author: repejota

README.md

@@ -16,12 +16,10 @@ Introduction
 
 A PHP client for the [NATS messaging system](https://nats.io).
 
->  Note: phpnats is under heavy development.
-
 Requirements
 ------------
 
-* php ~5.4
+* php 5.4+
 * [nats](https://github.com/derekcollison/nats) or [gnatsd](https://github.com/apcera/gnatsd)
 
 
@@ -68,7 +66,7 @@ $callback = function($payload)
 };
 $client->subscribe("foo", $callback);
 
-# Request 
+# Request
 $c->request('sayhello', 'Marty McFly', function ($response) {
     echo $response->getBody();
 });

VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

src/Connection.php

@@ -186,7 +186,6 @@ private function getStream($address, $timeout = null)
         }
         $errno = null;
         $errstr = null;
-        //$fp = stream_socket_client($address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT);
 
         $fp = $this->streamWrapper->getStreamSocketClient($address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT);
 
@@ -221,6 +220,17 @@ public function connect($timeout = null)
         $this->streamSocket = $this->getStream($this->options->getAddress(), $timeout);
         $msg = 'CONNECT '.$this->options;
         $this->send($msg);
+
+        $response = $this->receive();
+
+        $this->ping();
+        $response = $this->receive();
+
+        if ($response !== "PONG") {
+            if (strpos($response, '-ERR')!== false) {
+                throw new \Exception("Failing connection: $response");
+            }
+        }
     }
 
     /**
@@ -333,6 +343,9 @@ private function handleMSG($line)
         if (count($parts) == 5) {
             $length = $parts[5];
             $subject = $parts[3];
+        } elseif (count($parts) == 4) {
+            $length = $parts[3];
+            $subject = $parts[1];
         }
 
         $payload = $this->receive($length);

tests/Unit/ConnectionTest.php

@@ -4,8 +4,6 @@
 use Nats;
 use Nats\ConnectionOptions;
 use Nats\StreamWrapper;
-use org\bovigo\vfs\vfsStream;
-use org\bovigo\vfs\vfsStreamFile;
 use Prophecy\Argument;
 
 /**
@@ -43,20 +41,36 @@ class ConnectionTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $options = new ConnectionOptions();
+        $streamWrapper = $this->getMockStreamSocketClient();
 
+        $this->c = new Nats\Connection($options);
+        $this->c->setStreamWrapper($streamWrapper->reveal());
+        $this->c->connect();
+    }
+
+    /**
+     * Function for building Socket Mock.
+     *
+     * @return StreamWrapper
+    */
+    private function getMockStreamSocketClient()
+    {
         $streamWrapper = $this->prophesize("Nats\StreamWrapper");
+        $streamWrapper->setStreamTimeout(Argument::any(), Argument::any())->willReturn(true);
         $streamWrapper->getStreamSocketClient(Argument::any(), Argument::any(), Argument::any(), Argument::any(), Argument::any())->will(function ($args) {
-            return fopen("/tmp/".uniqid(), 'w');
+            $fileName = "/tmp/".uniqid();
+            $f  = fopen($fileName, 'w');
+            fwrite($f, "INFO: \n");
+            fwrite($f, "-ERR \n");
 
-        });
+            return $f;
 
-        $streamWrapper->setStreamTimeout(Argument::any(), Argument::any())->willReturn(true);
+        });
 
-        $this->c = new Nats\Connection($options);
-        $this->c->setStreamWrapper($streamWrapper->reveal());
-        $this->c->connect();
+        return $streamWrapper;
     }
 
+
     /**
      * Test Connection.
      *
@@ -73,6 +87,7 @@ public function testConnection()
         $this->assertFalse($this->c->isConnected());
     }
 
+
     /**
      * Test Ping command.
      *