Skip to content

Commit ec41cbb

Browse files
authored
Merge pull request #15 from RobberPhex/iana-port
etcd default port is 2379
2 parents c2ff6c7 + f27cac1 commit ec41cbb

12 files changed

+25
-23
lines changed

.travis.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
language: php
2+
dist: trusty
23
before_install: bash bin/build_etcd
34
php:
4-
- 5.4
5-
- 5.5
6-
- hhvm
5+
- '5.4'
6+
- '5.5'
7+
- '5.6'
8+
- '7.0'
9+
- '7.1'
10+
- hhvm
11+
- nightly
712
before_script:
813
- composer install
914
script: vendor/bin/phpunit

bin/build_etcd

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#!/bin/bash
22

3-
wget -c https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz
4-
tar -zxf go1.4.linux-amd64.tar.gz
5-
git clone https://github.com/coreos/etcd.git
6-
export GOROOT=$PWD/go
7-
#export GOPATH=$PWD/go
8-
export PATH=$GOPATH/bin:$PATH
9-
go get golang.org/x/tools/cmd/cove
10-
go get golang.org/x/tools/cmd/vet
11-
cd etcd && ./build
3+
ETCD_VERSION=v3.2.4
4+
5+
wget -c https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
6+
tar -zxf etcd-${ETCD_VERSION}-linux-amd64.tar.gz
7+
8+
cd etcd-${ETCD_VERSION}-linux-amd64
129

1310
# Start etcd
14-
./bin/etcd > /dev/null 2>&1 &
11+
./etcd > /dev/null 2>&1 &

src/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
class Client
1313
{
14-
private $server = 'http://127.0.0.1:4001';
14+
private $server = 'http://127.0.0.1:2379';
1515

1616
private $guzzleclient;
1717

src/Command/EtcdGetCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function configure()
2525
'server',
2626
InputArgument::OPTIONAL,
2727
'Base url of etcd server',
28-
'http://127.0.0.1:4001'
28+
'http://127.0.0.1:2379'
2929
);
3030
}
3131

src/Command/EtcdLsCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected function configure()
2727
->addArgument(
2828
'server',
2929
InputArgument::OPTIONAL,
30-
'Base url of etcd server and the default is http://127.0.0.1:4001'
30+
'Base url of etcd server and the default is http://127.0.0.1:2379'
3131
)
3232
->addOption(
3333
'recursive',

src/Command/EtcdMkCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function configure()
3131
)->addArgument(
3232
'server',
3333
InputArgument::OPTIONAL,
34-
'Base url of etcd server and the default is http://127.0.0.1:4001'
34+
'Base url of etcd server and the default is http://127.0.0.1:2379'
3535
);
3636
}
3737

src/Command/EtcdMkdirCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected function configure()
2424
)->addArgument(
2525
'server',
2626
InputArgument::OPTIONAL,
27-
'Base url of etcd server and the default is http://127.0.0.1:4001'
27+
'Base url of etcd server and the default is http://127.0.0.1:2379'
2828
)->addOption(
2929
'ttl',
3030
null,

src/Command/EtcdRmCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected function configure()
2525
->addArgument(
2626
'server',
2727
InputArgument::OPTIONAL,
28-
'Base url of etcd server and the default is http://127.0.0.1:4001'
28+
'Base url of etcd server and the default is http://127.0.0.1:2379'
2929
);
3030
}
3131

src/Command/EtcdRmdirCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected function configure()
2626
->addArgument(
2727
'server',
2828
InputArgument::OPTIONAL,
29-
'Base url of etcd server and the default is http://127.0.0.1:4001'
29+
'Base url of etcd server and the default is http://127.0.0.1:2379'
3030
)
3131
->addOption(
3232
'recursive',

src/Command/EtcdUpdateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function configure()
3030
)->addArgument(
3131
'server',
3232
InputArgument::OPTIONAL,
33-
'Base url of etcd server and the default is http://127.0.0.1:4001'
33+
'Base url of etcd server and the default is http://127.0.0.1:2379'
3434
)->addOption(
3535
'ttl',
3636
null,

0 commit comments

Comments
 (0)