Skip to content

Commit

Permalink
adjust mockery minimum version again for phpunit
Browse files Browse the repository at this point in the history
and php 5.6 build success. Maybe I read the sources correct this time.
refs #30

reordered the composer-flags env variable string to better see what is
being used as dependencies in the travisci UI. refs #30
  • Loading branch information
graste committed Jan 30, 2018
1 parent 2c12b3c commit 4e4972e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ matrix:
fast_finish: true
include:
- php: 5.6
env: COMPOSER_FLAGS="update --prefer-source --prefer-lowest --prefer-stable"
env: COMPOSER_FLAGS="update --prefer-lowest --prefer-stable --prefer-source"
- php: 7.0
env: COMPOSER_FLAGS="update --prefer-source --prefer-stable"
env: COMPOSER_FLAGS="update --prefer-stable --prefer-source"
- php: 7.1
env: COMPOSER_FLAGS="install"
- php: 7.1
env: COMPOSER_FLAGS="update --prefer-source --prefer-stable"
env: COMPOSER_FLAGS="update --prefer-stable --prefer-source"
- php: 7.2
env: COMPOSER_FLAGS="install"
- php: 7.2
env: COMPOSER_FLAGS="update --prefer-source --prefer-stable"
env: COMPOSER_FLAGS="update --prefer-stable --prefer-source"
- php: 7.2
env: COMPOSER_FLAGS="update --prefer-source --prefer-lowest --prefer-stable"
env: COMPOSER_FLAGS="update --prefer-lowest --prefer-stable --prefer-source"
allow_failures:
- php: nightly

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"phpunit/phpunit": "^5.4 || ^6.0",
"phpmd/phpmd": "^2.6",
"squizlabs/php_codesniffer": "^2.8 || ^3.0",
"mockery/mockery": "^0.9 || ^1.0"
"mockery/mockery": "^0.9.9 || ^1.0"
},
"autoload": {
"psr-4": { "Trellis\\": "src/" }
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4e4972e

Please sign in to comment.