Skip to content

Commit 102ebf6

Browse files
committed
Adjust dependencies and travis config
1 parent 151ede2 commit 102ebf6

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

.travis.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,12 @@ env:
66
- RUN_TESTS=1
77

88
php:
9-
- 5.4
10-
- 5.5
119
- 5.6
1210
- 7.0
13-
- hhvm
11+
- 7.1
1412

1513
sudo: false
1614

17-
matrix:
18-
include:
19-
- php: 5.4
20-
env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
21-
- php: 5.6
22-
env: PHPCS=1 RUN_TESTS=0
23-
2415
before_script:
2516
- travis_retry composer self-update
2617
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
@@ -30,4 +21,4 @@ script:
3021
- sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p -n --extensions=php --standard=psr2 ./src ./tests; fi"
3122

3223
after_script:
33-
- if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover; fi
24+
- php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"cakephp/cakephp": "~3.4"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit" : "~5.7",
23+
"phpunit/phpunit": "^5.7|^6.0",
2424
"scrutinizer/ocular": "~1.1",
2525
"squizlabs/php_codesniffer": "~2.3.0"
2626
},

0 commit comments

Comments
 (0)