Skip to content

Commit

Permalink
Merge pull request #186 from cakephp/coveralls
Browse files Browse the repository at this point in the history
Make Coveralls work again
  • Loading branch information
lorenzo committed Jan 19, 2016
2 parents ab1c17d + f41ccdb commit 2ff8794
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ matrix:
fast_finish: true

include:
- php: 5.4
- php: 7.0
env: COVERALLS=1 DEFAULT=0

- php: 5.4
Expand Down Expand Up @@ -52,6 +52,7 @@ matrix:
env: HHVM=1 DB=mysql db_dsn='mysql://[email protected]/cakephp_test'

before_script:
- sh -c "if [ '$HHVM' != '1' ]; then phpenv config-rm xdebug.ini; fi"
- composer self-update
- sh -c "if [ '$PREFER_LOWEST' != '1' ]; then composer install --prefer-source --no-interaction; fi"
- sh -c "if [ '$PREFER_LOWEST' = '1' ]; then composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi"
Expand All @@ -72,7 +73,7 @@ before_script:
script:
- sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
- sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=psr2 --ignore=tests/bootstrap.php,tests/comparisons/*,tests/test_app/* ./src ./tests ; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover build/logs/clover.xml || true; fi"
- sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"

notifications:
Expand Down
7 changes: 7 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@
<directory suffix=".ctp">./tests/</directory>
</blacklist>
</filter>

<!-- Prevent coverage reports from looking in tests, vendors, config folders -->
<filter>
<whitelist>
<directory suffix=".php">./src/</directory>
</whitelist>
</filter>

</phpunit>

0 comments on commit 2ff8794

Please sign in to comment.