Skip to content

Commit

Permalink
Merge pull request #52 from SignpostMarv/patch-3
Browse files Browse the repository at this point in the history
phpunit 9 was released
  • Loading branch information
muglug authored Feb 7, 2020
2 parents 8e2be02 + 23c57a0 commit 59dbe2f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
20 changes: 18 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ php:
- 7.1
- 7.2
- 7.3
- 7.4 # Psalm does not support 7.4 yet (uses Fn)
- 7.4
before_install:
- phpenv config-rm xdebug.ini || true
- composer clear-cache

install:
- composer install
- if [[ "$DEPS" = 'high' ]]; then travis_retry composer $DEFAULT_COMPOSER_FLAGS update; fi
- if [[ "$DEPS" = 'high' || "$DEPS" = 'dev' ]]; then travis_retry composer $DEFAULT_COMPOSER_FLAGS update; fi
- if [[ "$DEPS" = 'high' ]]; then composer require $DEFAULT_COMPOSER_FLAGS --prefer-stable vimeo/psalm; fi
- if [[ "$DEPS" = 'low' ]]; then travis_retry composer $DEFAULT_COMPOSER_FLAGS --prefer-lowest --prefer-stable update; fi
- if [[ "$DEPS" = 'stable' ]]; then travis_retry composer $DEFAULT_COMPOSER_FLAGS --prefer-stable update; fi
- ./vendor/bin/psalm --version
Expand All @@ -22,5 +23,20 @@ env:
- DEPS="low"
- DEPS="high"
- DEPS="stable"
- DEPS="dev"
global:
- DEFAULT_COMPOSER_FLAGS="--no-interaction --no-suggest"

cache:
directories:
- ./vendor

allow_failures:
- php: 7.1
env: DEPS="dev"
- php: 7.2
env: DEPS="dev"
- php: 7.3
env: DEPS="dev"
- php: 7.4
env: DEPS="dev"
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"phpunit/phpunit": "^6.0 || ^7.0 || ^8.0",
"phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
"vimeo/psalm": "^3.6.2 || dev-master",
"composer/semver": "^1.4",
"ocramius/package-versions": "^1.3"
Expand Down

0 comments on commit 59dbe2f

Please sign in to comment.