Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/16'
Browse files Browse the repository at this point in the history
Close #16
  • Loading branch information
weierophinney committed Oct 11, 2016
2 parents 0f413f2 + df08b04 commit 300f4f2
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .coveralls.yml
@@ -0,0 +1,2 @@
coverage_clover: clover.xml
json_path: coveralls-upload.json
2 changes: 2 additions & 0 deletions .gitignore
@@ -1,2 +1,4 @@
vendor/
phpunit.xml
clover.xml
coveralls-upload.json
8 changes: 7 additions & 1 deletion .travis.yml
Expand Up @@ -30,6 +30,7 @@ matrix:
env:
- DEPS=locked
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7
env:
- DEPS=latest
Expand All @@ -56,9 +57,14 @@ before_install:
install:
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
- travis_retry composer install $COMPOSER_ARGS
- composer show

script:
- composer test
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi
- if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

after_script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
4 changes: 3 additions & 1 deletion composer.json
Expand Up @@ -53,8 +53,10 @@
"@cs-check",
"@test"
],
"upload-coverage": "coveralls -v",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit"
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover clover.xml"
}
}
7 changes: 7 additions & 0 deletions phpunit.xml.dist
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./vendor/autoload.php" colors="true">
<testsuites>
<testsuite name="ZFVersioning Module Tests">
<directory>./test</directory>
</testsuite>
</testsuites>

<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
</phpunit>

0 comments on commit 300f4f2

Please sign in to comment.