Skip to content

Commit

Permalink
Travis fixes
Browse files Browse the repository at this point in the history
- Running coveralls just on PHP 7 (it has a dependency of guzzle that does not work in PHP 5.4)
- Installing the phpcs which was missing (it was a dependency of Zumba code standard repo before)
- Removed the coveralls from dev dependency. It is just for travis now in php 7
  • Loading branch information
jrbasso committed May 6, 2016
1 parent da359fc commit df2beab
Show file tree
Hide file tree
Showing 4 changed files with 141 additions and 504 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ php:
- 5.4
- 5.5
- 5.6
- hhvm
- 7.0
- hhvm

before_script:
- composer install --dev
- if [ $TRAVIS_PHP_VERSION = '7.0' ]; then composer require satooshi/php-coveralls; fi
- composer install

script:
- ./vendor/bin/phpunit --coverage-text
- if [ $TRAVIS_PHP_VERSION = '7.0' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi
- ./vendor/bin/phpcs --standard=PSR2 src

after_script:
- php vendor/bin/coveralls -v
after_success:
- if [ $TRAVIS_PHP_VERSION = '7.0' ]; then php vendor/bin/coveralls; fi
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"psr/log": "1.0.*"
},
"require-dev": {
"phpunit/phpunit": "4.4.*",
"satooshi/php-coveralls": "dev-master"
"phpunit/phpunit": "4.8.*",
"squizlabs/php_codesniffer": "2.6.*"
},
"autoload": {
"psr-4" : {
Expand Down

0 comments on commit df2beab

Please sign in to comment.