Merge pull request #15 from RobberPhex/iana-port

etcd default port is 2379
linkorb · Jul 24, 2017 · ec41cbb · ec41cbb
2 parents c2ff6c7 + f27cac1
commit ec41cbb
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,14 @@
 language: php
+dist: trusty
 before_install: bash bin/build_etcd
 php:
-- 5.4
-- 5.5
-- hhvm
+  - '5.4'
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - '7.1'
+  - hhvm
+  - nightly
 before_script:
 - composer install
 script: vendor/bin/phpunit
diff --git a/bin/build_etcd b/bin/build_etcd
@@ -1,14 +1,11 @@
 #!/bin/bash
 
-wget -c https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz
-tar -zxf go1.4.linux-amd64.tar.gz
-git clone https://github.com/coreos/etcd.git
-export GOROOT=$PWD/go
-#export GOPATH=$PWD/go
-export PATH=$GOPATH/bin:$PATH
-go get golang.org/x/tools/cmd/cove
-go get golang.org/x/tools/cmd/vet
-cd etcd && ./build
+ETCD_VERSION=v3.2.4
+
+wget -c https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
+tar -zxf etcd-${ETCD_VERSION}-linux-amd64.tar.gz
+
+cd etcd-${ETCD_VERSION}-linux-amd64
 
 # Start etcd
-./bin/etcd > /dev/null 2>&1 &
+./etcd > /dev/null 2>&1 &
diff --git a/src/Client.php b/src/Client.php
@@ -11,7 +11,7 @@
 
 class Client
 {
-    private $server = 'http://127.0.0.1:4001';
+    private $server = 'http://127.0.0.1:2379';
 
     private $guzzleclient;
 

diff --git a/src/Command/EtcdGetCommand.php b/src/Command/EtcdGetCommand.php
@@ -25,7 +25,7 @@ protected function configure()
                 'server',
                 InputArgument::OPTIONAL,
                 'Base url of etcd server',
-                'http://127.0.0.1:4001'
+                'http://127.0.0.1:2379'
             );
     }
 

diff --git a/src/Command/EtcdLsCommand.php b/src/Command/EtcdLsCommand.php
@@ -27,7 +27,7 @@ protected function configure()
             ->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             )
             ->addOption(
                 'recursive',

diff --git a/src/Command/EtcdMkCommand.php b/src/Command/EtcdMkCommand.php
@@ -31,7 +31,7 @@ protected function configure()
             )->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             );
     }
 

diff --git a/src/Command/EtcdMkdirCommand.php b/src/Command/EtcdMkdirCommand.php
@@ -24,7 +24,7 @@ protected function configure()
             )->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             )->addOption(
                 'ttl',
                 null,

diff --git a/src/Command/EtcdRmCommand.php b/src/Command/EtcdRmCommand.php
@@ -25,7 +25,7 @@ protected function configure()
             ->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             );
     }
 

diff --git a/src/Command/EtcdRmdirCommand.php b/src/Command/EtcdRmdirCommand.php
@@ -26,7 +26,7 @@ protected function configure()
             ->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             )
             ->addOption(
                 'recursive',

diff --git a/src/Command/EtcdUpdateCommand.php b/src/Command/EtcdUpdateCommand.php
@@ -30,7 +30,7 @@ protected function configure()
             )->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             )->addOption(
                 'ttl',
                 null,

diff --git a/src/Command/EtcdUpdateDirCommand.php b/src/Command/EtcdUpdateDirCommand.php
@@ -26,7 +26,7 @@ protected function configure()
             ->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             )->addOption(
                 'ttl',
                 null,

diff --git a/src/Command/EtcdWatchCommand.php b/src/Command/EtcdWatchCommand.php
@@ -26,7 +26,7 @@ protected function configure()
             ->addArgument(
                 'server',
                 InputArgument::OPTIONAL,
-                'Base url of etcd server and the default is http://127.0.0.1:4001'
+                'Base url of etcd server and the default is http://127.0.0.1:2379'
             )->addOption(
                 'recursive',
                 null,