Skip to content

Commit 1057dcf

Browse files
authored
Merge pull request #525 from kokspflanze/phpunit/patch-version
PHPUnit 6 support added
2 parents 2bcd1f4 + 1514e6d commit 1057dcf

21 files changed

+484
-388
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ env:
1111
global:
1212
- COMPOSER_ARGS="--no-interaction"
1313
- LATEST_DEPS="zendframework/zend-mvc-console"
14+
- LEGACY_DEPS="phpunit/phpunit"
1415

1516
matrix:
1617
fast_finish: true
@@ -70,10 +71,11 @@ before_install:
7071
- travis_retry composer self-update
7172

7273
install:
74+
- travis_retry composer install $COMPOSER_ARGS
75+
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
7376
- if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
7477
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
7578
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
76-
- travis_retry composer install $COMPOSER_ARGS
7779
- composer show
7880

7981
script:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"zendframework/zend-servicemanager": "^2.7.6 || ^3.1"
4949
},
5050
"require-dev": {
51-
"phpunit/phpunit": "^5.6.0",
51+
"phpunit/phpunit": "^5.7.17 || ^6.2.1",
5252
"squizlabs/php_codesniffer": "^2.7",
5353
"doctrine/data-fixtures": "^1.2.1",
5454
"doctrine/migrations": "^1.4.1",

0 commit comments

Comments
 (0)