Skip to content

Commit

Permalink
Rely on own phpunit, not one from CI service
Browse files Browse the repository at this point in the history
  • Loading branch information
keradus committed Jun 17, 2016
1 parent e67016f commit c34ff3d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ cache:
- $HOME/.composer/cache

before_install:
- mv $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini $HOME/xdebug.ini || return 0
- 'if [ "$SYMFONY_VERSION" != "" ]; then sed -i "s/\"symfony\/\([^\"]*\)\": \"[^\"]*\"/\"symfony\/\1\": \"$SYMFONY_VERSION\"/g" composer.json; fi'

install:
- travis_retry composer global require hirak/prestissimo
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction

script:
- phpunit --verbose --coverage-clover build/logs/clover.xml
- cp $HOME/xdebug.ini $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini || return 0
- vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml
- phpenv config-rm xdebug.ini || return 0
- php php-cs-fixer --diff --dry-run -v fix

Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"sebastian/diff": "~1.1"
},
"require-dev": {
"satooshi/php-coveralls": "0.7.*@dev"
"phpunit/phpunit": "^4.5|^5",
"satooshi/php-coveralls": "^0.7.1"
},
"autoload": {
"psr-4": { "Symfony\\CS\\": "Symfony/CS/" }
Expand Down

0 comments on commit c34ff3d

Please sign in to comment.