Skip to content

Commit

Permalink
Allow the bundle to use atoum 3.x to be compatible with PHP 7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jdecool committed Feb 8, 2017
1 parent 34f9a8e commit 8cba684
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ php:
- 5.5
- 5.6
- 7.0

- 7.1

cache:
directories:
Expand All @@ -21,7 +21,8 @@ env:

script:
- composer update $COMPOSER_PREFER
- "[[ \"$TRAVIS_PHP_VERSION\" != '5.3' && \"$TRAVIS_PHP_VERSION\" != '5.4' ]] && composer require --dev 'atoum/reports-extension:^2.0.1' || true"
- "[[ \"$TRAVIS_PHP_VERSION\" == '7.1' ]] && composer require 'atoum/atoum:dev-3.0.x-dev' || true"
- "[[ \"$TRAVIS_PHP_VERSION\" != '5.3' && \"$TRAVIS_PHP_VERSION\" != '5.4' && \"$TRAVIS_PHP_VERSION\" != '7.1' ]] && composer require --dev 'atoum/reports-extension:^2.0.1' || true"
- bin/atoum -ncc

notifications:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"symfony/finder": ">=2.3.0|^3.0",
"symfony/dom-crawler": ">=2.3.0|^3.0",
"symfony/css-selector": ">=2.3.0|^3.0",
"atoum/atoum": ">=2.1.0,<3.0",
"atoum/atoum": "^2.1.0|^3.0",
"fzaninotto/faker": "1.*"
},
"require-dev": {
Expand Down

0 comments on commit 8cba684

Please sign in to comment.