Skip to content

Commit

Permalink
Merge branch 'hotfix/15' into release-1.0.0
Browse files Browse the repository at this point in the history
Forward port #15
  • Loading branch information
geerteltink committed Dec 14, 2017
2 parents 0437fab + dbb91de commit 5bf72d5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -9,7 +9,7 @@ cache:
env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="satooshi/php-coveralls"
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
include:
Expand Down Expand Up @@ -49,7 +49,7 @@ script:
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

after_script:
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then vendor/bin/php-coveralls -v ; fi

notifications:
email: false
3 changes: 1 addition & 2 deletions composer.json
Expand Up @@ -68,7 +68,6 @@
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"upload-coverage": "coveralls -v"
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}

0 comments on commit 5bf72d5

Please sign in to comment.