Merge branch 'release/0.8.5'

Author: repejota

.gitignore

@@ -4,8 +4,9 @@ vendor
 cover
 *.phar
 /composer.phar
-/phpDocumentor.phar
+/phpdoc.phar
 /composer.lock
 /docs/api
 build
 .idea
+coverage

CONTRIBUTORS

@@ -1,10 +1,23 @@
-Adrià Cidre <adria.cidre@gmail.com> - http://oridoki.com - @adriacidre
-José Gil <josgilmo@gmail.com> - @josgilmo
-Gorka López de Torre <glopezdetorre@gmail.com> - http://gorka.io - @glopezdetorre
-Issel Guberna - http://isselguberna.com/ - @octante
-Donal Byrne - <byrnedo@tcd.ie> - http://www.byrnedo.com/
-Dominique Feyer - <dfeyer@ttree.ch> - http://www.ttree.ch/
-Oliver Mack -
-Superbug - http://www.superbug.co/
-netroby - http://www.netroby.com/
-
+Adria Cidre <adria.cidre@gmail.com>
+Anthony Sterling <mail@anthonysterling.com>
+DependenCI Bot <dependenci@miguelpiedrafita.com>
+Dominique Feyer <dfeyer@ttree.ch>
+Dominique Feyer <noreply@github.com>
+Donal Byrne <byrnedo@tcd.ie>
+Donal Byrne <noreply@github.com>
+Gorka López de Torre <glopezdetorre@gmail.com>
+Issel Guberna <issel.guberna@gmail.com>
+Ivan Padavic <ipadavic@gmail.com>
+Jose Gil <jose.gilmolina@gmail.com>
+Oliver Mack <dev@oliver-mack.com>
+Oliver Mack <mail@oliver-mack.com>
+Raül Pérez <adria.cidre@gmail.com>
+Raül Pérez <byrnedo@tcd.ie>
+Raül Pérez <noreply@github.com>
+Raül Pérez <raul.perez@r3labs.io>
+Raül Pérez <repejota@gmail.com>
+Raül Pérez <repejota@users.noreply.github.com>
+Serghei Iakovlev <serghei@phalconphp.com>
+Superbug <evren@superbug.co>
+jgil <jgil@trovit.com>
+netroby <netroby@users.noreply.github.com>

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 repejota@gmail.com
+Copyright (c) 2015-2017 repejota@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,7 +1,7 @@
 PHPCS_PHAR = https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
 COMPOSER_PHAR = https://getcomposer.org/composer.phar
 PHPDOCUMENTOR_PHAR_URL = https://github.com/phpDocumentor/phpDocumentor2/releases/download/v2.9.0/phpDocumentor.phar
-CLEAN_FILES = composer.phar composer.lock phpDocumentor.phar phpcs.phar phpcbf.phar
+CLEAN_FILES = composer.phar composer.lock phpdoc.phar phpcs.phar phpcbf.phar .idea
 CLEAN_FOLDERS = bin build cover vendor docs/api
 CLEAN_PATHS = $(CLEAN_FILES) $(CLEAN_FOLDERS)
 SOURCE_CODE_PATHS = src test examples

README.md

@@ -22,7 +22,7 @@ Requirements
 ------------
 
 * php 5.6+
-* [nats](https://github.com/derekcollison/nats) or [gnatsd](https://github.com/apcera/gnatsd)
+* [gnatsd](https://github.com/apcera/gnatsd)
 
 
 Usage

VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

composer.json

@@ -10,7 +10,8 @@
     "require-dev": {
         "phpunit/phpunit": "5.*",
         "phpspec/phpspec": "^3.0",
-        "satooshi/php-coveralls": "dev-master"
+        "satooshi/php-coveralls": "dev-master",
+        "leanphp/phpspec-code-coverage": "^3.2@dev"
     },
     "authors": [
         {

examples/connect.php

@@ -1,8 +1,13 @@
 <?php
 require_once __DIR__.'/../vendor/autoload.php';
 
-$connectionOptions = new \Nats\ConnectionOptions();
-$connectionOptions->setHost('localhost')->setPort(4222);
+$connectionOptions = new \Nats\ConnectionOptions(
+    [
+     'host' => '127.0.0.1',
+     'port' => 4222,
+    ]
+);
+
 $c = new Nats\Connection($connectionOptions);
 $c->connect();
 $c->close();

examples/connectauthtoken.php

@@ -0,0 +1,8 @@
+<?php
+require_once __DIR__.'/../vendor/autoload.php';
+
+$connectionOptions = new \Nats\ConnectionOptions();
+$connectionOptions->setHost('localhost')->setPort(4222)->setToken('supersecrettoken');
+$c = new Nats\Connection($connectionOptions);
+$c->connect();
+$c->close();

examples/simpleclient/main.php

@@ -0,0 +1,11 @@
+<?php
+require_once __DIR__.'/../../vendor/autoload.php';
+
+use Nats\Connection as NatsClient;
+
+$nc = new NatsClient();
+$nc->connect();
+
+printf('Connected to NATS at %s'.PHP_EOL, $nc->connectedServerId());
+
+$nc->wait();