From e125b296f99f1abd6c57b1a52e37306a1128082b Mon Sep 17 00:00:00 2001 From: Gianluca Arbezzano Date: Mon, 23 Mar 2015 21:42:54 +0100 Subject: [PATCH 1/4] phpunit configuration improvement This feature implement env parameters for phpUnit configuration. This upgrade is a first step for multi influxdb version testing --- phpunit.xml.dist | 12 ++++++++++++ tests/bootstrap.php | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ada74cb23..2b12f4ecb 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -12,6 +12,18 @@ tests + + + + + + + + + + + + src diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 99b776def..4f2e9ae33 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,18 +1,18 @@ [ - "host" => "localhost", - "port" => 8086, - "protocol" => "http", - "database" => "tcp.test", - "username" => "root", - "password" => "root", + "host" => getenv('HOST'), + "port" => getenv('TCP_PORT'), + "protocol" => getenv('TCP_PROTOCOL'), + "database" => getenv('TCP_DB'), + "username" => getenv('USERNAME'), + "password" => getenv('PASSWORD'), ], "udp" => [ - "host" => "localhost", - "port" => 5551, - "database" => "udp.test", - "username" => "root", - "password" => "root" + "host" => getenv('HOST'), + "port" => getenv('UDP_PORT'), + "database" => getenv('UDP_DB'), + "username" => getenv('USERNAME'), + "password" => getenv('PASSWORD'), ], ]; From 16197e22a94d8cdf5ddb25437f8551b8aff1fb46 Mon Sep 17 00:00:00 2001 From: Walter Dal Mut Date: Tue, 24 Mar 2015 08:30:55 +0100 Subject: [PATCH 2/4] Contributing doc file --- CONTRIBUTING.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..7af948a1a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,15 @@ +# Contributing to InfluxDB PHP SDK + +## Pull requests are always welcome + +Not sure if that typo is worth a pull request? Found a bug and know how to fix +it? Do it! We will appreciate it. Any significant improvement should be +documented as a GitHub issue before anybody starts working on it. + +We are always thrilled to receive pull requests. We do our best to process them +quickly. If your pull request is not accepted on the first try, don't get +discouraged! + +We follows the *vincent driessen's branching model* +[http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/) + From 4140300e328b626dde43980a05f863229bbff278 Mon Sep 17 00:00:00 2001 From: Walter Dal Mut Date: Wed, 8 Apr 2015 19:21:51 +0200 Subject: [PATCH 3/4] Files should end with a newline character --- src/InfluxDB/Adapter/HttpAdapter.php | 3 ++- src/InfluxDB/Exception/InfluxAuthorizationException.php | 3 ++- src/InfluxDB/Exception/InfluxBadResponseException.php | 3 ++- src/InfluxDB/Exception/InfluxGeneralException.php | 3 ++- src/InfluxDB/Exception/InfluxNoSeriesException.php | 3 ++- src/InfluxDB/Exception/InfluxUnexpectedResponseException.php | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/InfluxDB/Adapter/HttpAdapter.php b/src/InfluxDB/Adapter/HttpAdapter.php index 738f43c83..691b3b6d3 100644 --- a/src/InfluxDB/Adapter/HttpAdapter.php +++ b/src/InfluxDB/Adapter/HttpAdapter.php @@ -195,4 +195,5 @@ class HttpAdapter implements AdapterInterface, QueryableInterface } return $this->parseResponse($response); } -} \ No newline at end of file +} + diff --git a/src/InfluxDB/Exception/InfluxAuthorizationException.php b/src/InfluxDB/Exception/InfluxAuthorizationException.php index f4feb823f..83dcd32c7 100644 --- a/src/InfluxDB/Exception/InfluxAuthorizationException.php +++ b/src/InfluxDB/Exception/InfluxAuthorizationException.php @@ -5,4 +5,5 @@ namespace InfluxDB\Exception; class InfluxAuthorizationException extends InfluxGeneralException { -} \ No newline at end of file +} + diff --git a/src/InfluxDB/Exception/InfluxBadResponseException.php b/src/InfluxDB/Exception/InfluxBadResponseException.php index fc693200a..148dada20 100644 --- a/src/InfluxDB/Exception/InfluxBadResponseException.php +++ b/src/InfluxDB/Exception/InfluxBadResponseException.php @@ -5,4 +5,5 @@ namespace InfluxDB\Exception; class InfluxBadResponseException extends InfluxGeneralException { -} \ No newline at end of file +} + diff --git a/src/InfluxDB/Exception/InfluxGeneralException.php b/src/InfluxDB/Exception/InfluxGeneralException.php index 145947369..863095db8 100644 --- a/src/InfluxDB/Exception/InfluxGeneralException.php +++ b/src/InfluxDB/Exception/InfluxGeneralException.php @@ -5,4 +5,5 @@ namespace InfluxDB\Exception; class InfluxGeneralException extends \RuntimeException { -} \ No newline at end of file +} + diff --git a/src/InfluxDB/Exception/InfluxNoSeriesException.php b/src/InfluxDB/Exception/InfluxNoSeriesException.php index 117d6ccb8..39306690f 100644 --- a/src/InfluxDB/Exception/InfluxNoSeriesException.php +++ b/src/InfluxDB/Exception/InfluxNoSeriesException.php @@ -5,4 +5,5 @@ namespace InfluxDB\Exception; class InfluxNoSeriesException extends InfluxGeneralException { -} \ No newline at end of file +} + diff --git a/src/InfluxDB/Exception/InfluxUnexpectedResponseException.php b/src/InfluxDB/Exception/InfluxUnexpectedResponseException.php index 3d1ceae50..f7416c9a8 100644 --- a/src/InfluxDB/Exception/InfluxUnexpectedResponseException.php +++ b/src/InfluxDB/Exception/InfluxUnexpectedResponseException.php @@ -5,4 +5,5 @@ namespace InfluxDB\Exception; class InfluxUnexpectedResponseException extends InfluxGeneralException { -} \ No newline at end of file +} + From 4fa3ad0efa79e3ebeed9c376639b323342d51680 Mon Sep 17 00:00:00 2001 From: Walter Dal Mut Date: Wed, 8 Apr 2015 19:25:00 +0200 Subject: [PATCH 4/4] Bumped version 0.3.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9e11b32fc..d15723fbe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.1 +0.3.2