Skip to content

Commit 98fd9cc

Browse files
authored
Merge pull request #229 from rwifeng/Change_Log_Typo
changelog typo
2 parents 8ed2da7 + 3a03a36 commit 98fd9cc

File tree

3 files changed

+20
-29
lines changed

3 files changed

+20
-29
lines changed

.travis.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
sudo: false
22
language: php
3+
34
php:
4-
- 5.3
5-
- 5.4
6-
- 5.5
7-
- 5.6
8-
- 7.0
5+
- 5.3
6+
- 5.4
7+
- 5.5
8+
- 5.6
9+
- 7.0
10+
911
before_script:
10-
- export QINIU_TEST_ENV="travis"
11-
- travis_retry composer self-update
12-
- travis_retry composer install --no-interaction --prefer-source --dev
12+
- export QINIU_TEST_ENV="travis"
13+
- travis_retry composer self-update
14+
- travis_retry composer install --no-interaction --prefer-source --dev
15+
1316
script:
14-
- ./vendor/bin/phpcs --standard=PSR2 src
15-
- ./vendor/bin/phpcs --standard=PSR2 examples
16-
- ./vendor/bin/phpcs --standard=PSR2 tests
17-
- ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover tests/Qiniu/Tests/
17+
- ./vendor/bin/phpcs --standard=PSR2 src
18+
- ./vendor/bin/phpcs --standard=PSR2 examples
19+
- ./vendor/bin/phpcs --standard=PSR2 tests
20+
- ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover tests/Qiniu/Tests/
21+
1822
after_script:
19-
- wget https://scrutinizer-ci.com/ocular.phar
20-
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
21-
env:
22-
global:
23-
- secure: g6HrlivUd4b9wrHgeMEuYhf4ow0Jd+oasfU5TRFVngLYpgWPzHnzUUTkc/5IF+kzy/izoCbeZbkxTH53msshsz4PDprX9rbPJUUJ1Ve4i4fYihO+mn5kah1UKZWT13/fDWprJvxQYbHDjByopujxtaGEennYF1q2cap/FVlg1FI=
24-
- secure: NpJUf401jFQXxpqa/kPvBf11clwpaTusqyuIUKaSj/wi9l6z+rl24Owlg6P4Ibz4Z9o2YGZBuJeUAZJHmrrzdc4haQ4FEUi3qubnoXMm4D2FXWZKzjFCMG/ISFyw2tO1Gv4wiQiMjMtHMNHqvsJdrlw2OsbxzOu/M9GqfJTYHEE=
25-
- secure: ftap5/rKY4bOL2jXOmN7yp7miKsLDo8QJS8Gw0fF3rmcvITw/2Q+tEzVhCNh/kLRcqLJMHpHywnRF5drRuGH5gute1jt5K2gR/6WG3PZWp/OhoSoEzdPiv1xAkYFnipqIJjVAbGFRnWM7xtQL8gKQn3sUlQSCiOJ6QCzmmD0jGg=
23+
- wget https://scrutinizer-ci.com/ocular.phar
24+
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Changelog
1+
# Changelog
22

33
## 7.1.4 (2017-06-21)
44
### 增加

tests/bootstrap.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,11 @@
1919
$dummySecretKey = '1234567890';
2020
$dummyAuth = new Auth($dummyAccessKey, $dummySecretKey);
2121

22-
$tid = getenv('TRAVIS_JOB_NUMBER');
23-
2422
//cdn
2523
$timestampAntiLeechEncryptKey = getenv('QINIU_SDK_ENV_TIMESTAMP_ENCRPTKEY');
2624
$customDomain = "http://phpsdk.qiniuts.com";
2725

28-
var_dump($accessKey);
29-
var_dump($secretKey);
30-
var_dump($timestampAntiLeechEncryptKey);
31-
var_dump($_SERVER);
32-
33-
$testEnv = getenv('QINIU_TEST_ENV');
34-
26+
$tid = getenv('TRAVIS_JOB_NUMBER');
3527
if (!empty($tid)) {
3628
$pid = getmypid();
3729
$tid = strstr($tid, '.');

0 commit comments

Comments
 (0)