Merge pull request #525 from kokspflanze/phpunit/patch-version

PHPUnit 6 support added
doctrine · Jun 2, 2017 · 1057dcf · 1057dcf
2 parents 2bcd1f4 + 1514e6d
commit 1057dcf
Show file tree

Hide file tree

Showing 21 changed files with 484 additions and 388 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - LATEST_DEPS="zendframework/zend-mvc-console"
+    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   fast_finish: true
@@ -70,10 +71,11 @@ before_install:
   - travis_retry composer self-update
 
 install:
+  - travis_retry composer install $COMPOSER_ARGS
+  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
-  - travis_retry composer install $COMPOSER_ARGS
   - composer show
 
 script:

diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "zendframework/zend-servicemanager": "^2.7.6 || ^3.1"
     },
     "require-dev":       {
-        "phpunit/phpunit":                    "^5.6.0",
+        "phpunit/phpunit":                    "^5.7.17 || ^6.2.1",
         "squizlabs/php_codesniffer":          "^2.7",
         "doctrine/data-fixtures":             "^1.2.1",
         "doctrine/migrations":                "^1.4.1",