Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump phpunit version and remove minimum-stability flag #512

Merged
merged 3 commits into from
Jun 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,22 @@ php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7
- hhvm

matrix:
allow_failures:
- php: 7.0
- php: 7
- php: hhvm

before_script:
- composer install --no-interaction --prefer-source

script:
- ./vendor/bin/phpunit --coverage-clover ./build/clover.xml
- '[[ $TRAVIS_PHP_VERSION = hhvm ]] || php build/coverage-checker.php build/clover.xml 70'
- if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then php build/coverage-checker.php build/clover.xml 70; fi
- ./vendor/bin/phpcs --standard=vendor/doctrine/coding-standard/Doctrine ./src/ ./tests/

after_script:
- |
[[ $TRAVIS_PHP_VERSION = hhvm ]] || {
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml
}
- if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != '7' ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/clover.xml; fi
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"homepage": "http://www.michaelgallego.fr"
}
],
"minimum-stability": "dev",
"require": {
"php": ">=5.4",
"doctrine/common": ">=2.4,<2.6-dev",
Expand All @@ -44,7 +43,7 @@
"zendframework/zend-validator": "~2.3"
},
"require-dev": {
"phpunit/phpunit": "~3.7",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~2",
"doctrine/coding-standard": "dev-master",
"zendframework/zendframework": "~2.3"
Expand Down