Skip to content

Commit a66475b

Browse files
authored
Merge pull request influxdata#97 from aldas/update_dependencies
dependencies update
2 parents 64c79de + 593a945 commit a66475b

18 files changed

+1064
-654
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ vendor/
44
.idea
55
build/
66
test.php
7-
.project
7+
.project
8+
clover.xml

.travis.yml

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,32 @@ sudo: false
33
cache:
44
directories:
55
- $HOME/.composer/cache/files
6-
- $HOME/symfony-bridge/.phpunit
76

87
env:
98
global:
10-
- PHPUNIT_FLAGS="-v"
11-
- SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
9+
- CC_TEST_REPORTER_ID=303a289e61e8e11d8bcae115860c4fffc6e1e7fe2d504d20a773e69bd7641284
1210

1311
matrix:
1412
fast_finish: true
1513
include:
16-
# Minimum supported Symfony version with the latest PHP version
17-
- php: 7.2
18-
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak"
19-
20-
# Test the latest stable release
21-
- php: 5.5
14+
# - php: 5.5 is over EOL. phpunit does not support it anymore so we just ignore this version
2215
- php: 5.6
2316
- php: 7.0
2417
- php: 7.1
2518
- php: 7.2
26-
env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"
27-
28-
# Test LTS versions. This makes sure we do not use Symfony packages with version greater
29-
# than 2 or 3 respectively. Read more at https://github.com/symfony/lts
30-
- php: 7.2
31-
env: DEPENDENCIES="dunglas/symfony-lock:^2"
32-
- php: 7.2
33-
env: DEPENDENCIES="dunglas/symfony-lock:^3"
34-
- php: 7.2
35-
env: DEPENDENCIES="dunglas/symfony-lock:^4"
36-
37-
# Latest commit to master
38-
- php: 7.2
39-
env: STABILITY="dev"
40-
41-
allow_failures:
42-
# Dev-master is allowed to fail.
43-
- env: STABILITY="dev"
4419

4520
before_install:
46-
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
47-
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
48-
- if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
21+
# setup code climate reporter https://docs.codeclimate.com/docs/configuring-test-coverage
22+
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
23+
- chmod +x ./cc-test-reporter
24+
- ./cc-test-reporter before-build
4925

5026
install:
51-
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
52-
- if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
53-
- composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
54-
- ./vendor/bin/simple-phpunit install
27+
- composer update --prefer-dist --no-interaction
5528

5629
script:
5730
- composer validate --strict --no-check-lock
58-
- ./vendor/bin/simple-phpunit $PHPUNIT_FLAGS
59-
60-
addons:
61-
code_climate:
62-
repo_token: 303a289e61e8e11d8bcae115860c4fffc6e1e7fe2d504d20a773e69bd7641284
31+
- composer test-ci
6332

6433
after_script:
65-
- vendor/bin/test-reporter
34+
- ./cc-test-reporter after-build -t clover --exit-code $TRAVIS_TEST_RESULT

composer.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,10 @@
2727
],
2828
"require": {
2929
"php": "^5.5 || ^7.0",
30-
"guzzlehttp/guzzle": "^6.0",
31-
"symfony/event-dispatcher": "^2.0 || ^3.0 || ^4.0"
30+
"guzzlehttp/guzzle": "^6.0"
3231
},
3332
"require-dev": {
34-
"symfony/phpunit-bridge": "^3.4 || ^4.0",
35-
"codeclimate/php-test-reporter": "0.*",
36-
"symfony/config": "~2.8|~3.0|~4.0",
37-
"symfony/console": "~2.8|~3.0|~4.0",
38-
"symfony/filesystem": "~2.8|~3.0|~4.0",
39-
"symfony/stopwatch": "~2.8|~3.0|~4.0",
40-
"symfony/yaml": "~2.8|~3.0|~4.0"
33+
"phpunit/phpunit": "^5.7"
4134
},
4235
"autoload": {
4336
"psr-4": {
@@ -51,5 +44,9 @@
5144
},
5245
"suggest": {
5346
"stefanotorresi/influxdb-php-async": "An asyncronous client for InfluxDB, implemented via ReactPHP."
47+
},
48+
"scripts": {
49+
"test": "vendor/bin/phpunit",
50+
"test-ci": "vendor/bin/phpunit -v --coverage-clover=clover.xml"
5451
}
5552
}

0 commit comments

Comments
 (0)