Merge branch 'release/0.1.0'

Author: repejota

.gitignore

@@ -4,3 +4,4 @@ cover
 *.phar
 composer.lock
 build
+.idea

README.md

@@ -28,6 +28,30 @@ Requirements
 Usage
 -----
 
+### Installation
+
+Let's start by downloading composer into our project dir:
+```
+curl -O http://getcomposer.org/composer.phar
+chmod +x composer.phar
+```
+
+Now let's tell composer about our project's dependancies, in this case, PHPNats. The way we do this is by creating a composer.json file, and placing it in the root folder of our project, right next to composer.phar
+
+```
+{
+  "require": {
+    "repejota/nats": "master"
+  }
+}
+```
+Let's let Composer work its magic:
+```
+php composer.phar install
+```
+Composer will download all the dependencies defined in composer.json, and prepare all the files needed to autoload them.
+
+
 ### Basic Usage
 
 ```php
@@ -48,14 +72,21 @@ $client->subscribe("foo", $callback);
 $client->wait(1);
 ```
 
+
 Developer's Information
 -----------------------
 
+### Releases
+
+[Latest stable](https://github.com/repejota/phpnats/tree/master)
+[Latest dev](https://github.com/repejota/phpnats/tree/develop)
+
 ### Tests
 
 Tests are in the `tests` folder.
 To run them, you need `PHPUnit` and execute `make test`.
 
+
 ### Code Quality
 
 We are using [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer/docs)

VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

src/Connection.php

@@ -178,7 +178,7 @@ public function isConnected()
     public function connect()
     {
         $this->streamSocket = $this->getStream($this->options->getAddress());
-        $msg = 'CONNECT '.$this->options->toJSON();
+        $msg = 'CONNECT '.$this->options;
         $this->send($msg);
     }
 

src/ConnectionOptions.php

@@ -12,63 +12,63 @@ class ConnectionOptions
      *
      * @var string
      */
-    public $host = "localhost";
+    private $host = "localhost";
 
     /**
      * Port number to connect
      *
      * @var integer
      */
-    public $port = 4222;
+    private $port = 4222;
 
     /**
      * Username to connect
      *
      * @var string
      */
-    public $user = null;
+    private $user = null;
 
     /**
      * Password to connect
      *
      * @var string
      */
-    public $pass = null;
+    private $pass = null;
 
     /**
      * Language of this client
      *
      * @var string
      */
-    public $lang = "php";
+    private $lang = "php";
 
     /**
      * Version of this client
      *
      * @var string
      */
-    public $version = "0.0.5";
+    private $version = "0.0.5";
 
     /**
      * If verbose mode is enabled
      *
      * @var boolean
      */
-    public $verbose = false;
+    private $verbose = false;
 
     /**
      * If pedantic mode is enabled
      *
      * @var boolean
      */
-    public $pedantic = false;
+    private $pedantic = false;
 
     /**
      * If reconnect mode is enabled
      *
      * @var boolean
      */
-    public $reconnect = true;
+    private $reconnect = true;
 
     /**
      * Get the URI for a server
@@ -85,7 +85,7 @@ public function getAddress()
      *
      * @return string
      */
-    public function toJSON()
+    public function __toString()
     {
         $a = [
             "lang" => $this->lang,
@@ -101,4 +101,220 @@ public function toJSON()
         }
         return json_encode($a);
     }
+
+    /**
+     * Get host
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * Set host
+     *
+     * @param string $host Host.
+     *
+     * @return $this
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+
+        return $this;
+    }
+
+    /**
+     * Get port
+     *
+     * @return integer
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * Set port
+     *
+     * @param integer $port Port.
+     *
+     * @return $this
+     */
+    public function setPort($port)
+    {
+        $this->port = $port;
+
+        return $this;
+    }
+
+    /**
+     * Get user
+     *
+     * @return string
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * Set user
+     *
+     * @param string $user User.
+     *
+     * @return $this
+     */
+    public function setUser($user)
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    /**
+     * Get password
+     *
+     * @return string
+     */
+    public function getPass()
+    {
+        return $this->pass;
+    }
+
+    /**
+     * Set password
+     *
+     * @param string $pass Password.
+     *
+     * @return $this
+     */
+    public function setPass($pass)
+    {
+        $this->pass = $pass;
+
+        return $this;
+    }
+
+    /**
+     * Get language
+     *
+     * @return string
+     */
+    public function getLang()
+    {
+        return $this->lang;
+    }
+
+    /**
+     * Set language
+     *
+     * @param string $lang Language.
+     *
+     * @return $this
+     */
+    public function setLang($lang)
+    {
+        $this->lang = $lang;
+
+        return $this;
+    }
+
+    /**
+     * Get version
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * Set version
+     *
+     * @param string $version Version number.
+     *
+     * @return $this
+     */
+    public function setVersion($version)
+    {
+        $this->version = $version;
+
+        return $this;
+    }
+
+    /**
+     * Get verbose
+     *
+     * @return boolean
+     */
+    public function isVerbose()
+    {
+        return $this->verbose;
+    }
+
+    /**
+     * Set verbose
+     *
+     * @param boolean $verbose Verbose flag.
+     *
+     * @return $this
+     */
+    public function setVerbose($verbose)
+    {
+        $this->verbose = $verbose;
+
+        return $this;
+    }
+
+    /**
+     * Get pedantic
+     *
+     * @return boolean
+     */
+    public function isPedantic()
+    {
+        return $this->pedantic;
+    }
+
+    /**
+     * Set pedantic
+     *
+     * @param boolean $pedantic Pedantic flag.
+     *
+     * @return $this
+     */
+    public function setPedantic($pedantic)
+    {
+        $this->pedantic = $pedantic;
+
+        return $this;
+    }
+
+    /**
+     * Get reconnect
+     *
+     * @return boolean
+     */
+    public function isReconnect()
+    {
+        return $this->reconnect;
+    }
+
+    /**
+     * Set reconnect
+     *
+     * @param boolean $reconnect Reconnect flag.
+     *
+     * @return $this
+     */
+    public function setReconnect($reconnect)
+    {
+        $this->reconnect = $reconnect;
+
+        return $this;
+    }
 }