Merge branch 'release/0.0.3'

Author: Raül Pérez

Makefile

@@ -13,6 +13,6 @@ cs:
 	./phpcbf.phar src
 	./phpcbf.phar tests
 	./phpcbf.phar examples
-	./phpcs.phar src tests examples
+	./vendor/bin/phpcs src tests examples
 
 .PHONY: lint test cs cover

README.md

@@ -1,4 +1,4 @@
-phpnats 
+phpnats
 =======
 
 **Travis**
@@ -18,7 +18,7 @@ A PHP client for the [NATS messaging system](https://nats.io).
 Requirements
 ------------
 
-* php ~5.3
+* php ~5.4
 * [nats](https://github.com/derekcollison/nats) or [gnatsd](https://github.com/apcera/gnatsd)
 
 

VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

composer.json

@@ -9,7 +9,9 @@
         "email": "repejota@gmail.com",
         "homepage": "http://repejota.com"
     }],
-    "require": {},
+    "require": {
+        "zerkalica/phpcs": "dev-master"
+    },
     "require-dev": {
         "phpunit/phpunit": "4.7.*"
     },

src/Connection.php

@@ -137,6 +137,10 @@ public function getSubscriptions()
      */
     public function __construct($host = "localhost", $port = 4222)
     {
+        $this->_pings = 0;
+        $this->_pubs = 0;
+        $this->_subscriptions = 0;
+
         $this->_host = $host;
         $this->_port = $port;
         $this->_address = "tcp://" . $this->_host . ":" . $this->_port;

tests/Unit/ConnectionTest.php

@@ -16,21 +16,57 @@
 
 /**
  * Class TestConnection
+ *
  * @category Class
- * @package Nats\Tests\Unit
+ * @package  Nats\Tests\Unit
  * @author   Raül Përez <repejota@gmail.com>
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
  * @link     https://github.com/repejota/phpnats
  */
 class TestConnection extends \PHPUnit_Framework_TestCase
 {
+    private $_c;
+
+    /**
+     * Setup tests
+     *
+     * @return null
+     */
+    public function setUp()
+    {
+        $this->_c = $this->getMockBuilder('Nats\Connection')->getMock();
+
+        $this->_c->expects($this->any())
+            ->method("connect")
+            ->willReturn(null);
+
+        $this->_c->expects($this->any())
+            ->method("pingsCount")
+            ->willReturn(1);
+
+        $this->_c->expects($this->any())
+            ->method("pubsCount")
+            ->willReturn(1);
+
+        $this->_c->expects($this->any())
+            ->method("reconnectsCount")
+            ->willReturn(1);
+
+        $this->_c->expects($this->any())
+            ->method("subscriptionsCount")
+            ->willReturn(1);
+
+        $this->_c->expects($this->any())
+            ->method("getSubscriptions")
+            ->willReturn(["foo", "bar"]);
+    }
 
     /**
      * Test Dummy
      *
      * @return null
      */
-    public function testDummy() 
+    public function testDummy()
     {
         $this->assertTrue(true);
     }
@@ -40,44 +76,37 @@ public function testDummy()
      *
      * @return null
      */
-    public function testConnection() 
+    public function testConnection()
     {
-        $c = new Nats\Connection();
-        $c->connect();
-        $c->close();
+        $this->_c->connect();
+        $this->_c->close();
     }
 
     /**
      * Test Ping command
      *
      * @return null
      */
-    public function testPing() 
+    public function testPing()
     {
-        $c = new Nats\Connection();
-        $c->connect();
-        $c->ping();
-        $c->ping();
-        $count = $c->pingsCount();
+        $count = $this->_c->pingsCount();
         $this->assertInternalType("int", $count);
         $this->assertGreaterThan(0, $count);
-        $c->close();
+        $this->_c->close();
     }
 
     /**
      * Test Publish command
      *
      * @return null
      */
-    public function testPublish() 
+    public function testPublish()
     {
-        $c = new Nats\Connection();
-        $c->connect();
-        $c->publish("foo", "bar");
-        $count = $c->pubsCount();
-        $this->assertInternalType("int", $count);
-        $this->assertGreaterThan(0, $count);
-        $c->close();
+        $this->_c->publish("foo", "bar");
+        $this->count = $this->_c->pubsCount();
+        $this->assertInternalType("int", $this->count);
+        $this->assertGreaterThan(0, $this->count);
+        $this->_c->close();
     }
 
     /**
@@ -87,13 +116,11 @@ public function testPublish()
      */
     public function testReconnect()
     {
-        $c = new Nats\Connection();
-        $c->connect();
-        $c->reconnect();
-        $count = $c->reconnectsCount();
-        $this->assertInternalType("int", $count);
-        $this->assertGreaterThan(0, $count);
-        $c->close();
+        $this->_c->reconnect();
+        $this->count = $this->_c->reconnectsCount();
+        $this->assertInternalType("int", $this->count);
+        $this->assertGreaterThan(0, $this->count);
+        $this->_c->close();
     }
 
     /**
@@ -103,18 +130,15 @@ public function testReconnect()
      */
     public function testSubscription()
     {
-        $c = new Nats\Connection();
-        $c->connect();
-        $c->subscribe(
-            "foo", function ($message) {
-                $this->assertNotNull($message);
-            }
-        );
-        $this->assertGreaterThan(0, $c->subscriptionsCount());
-        $subscriptions = $c->getSubscriptions();
+        $callback = function ($message) {
+            $this->assertNotNull($message);
+        };
+        $this->_c->subscribe("foo", $callback);
+        $this->assertGreaterThan(0, $this->_c->subscriptionsCount());
+        $subscriptions = $this->_c->getSubscriptions();
         $this->assertInternalType("array", $subscriptions);
 
-        $c->publish("foo", "bar");
-        $c->wait(1);
+        $this->_c->publish("foo", "bar");
+        $this->_c->wait(1);
     }
 }