Skip to content

Commit 1c6572f

Browse files
committed
Merge with upstream master
2 parents 37f0bad + 19dbbd8 commit 1c6572f

18 files changed

+1186
-818
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ matrix:
1616
dist: precise
1717
sudo: false
1818
before_script: rm composer.lock && composer install
19-
script: ./vendor/phpunit/phpunit/phpunit
19+
script: ./vendor/bin/phpunit --coverage-clover build/coverage/xml
20+
after_script: ./vendor/bin/codacycoverage clover build/coverage/xml
21+

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"php": ">=5.3.2"
1313
},
1414
"require-dev": {
15-
"phpunit/phpunit": "~4.8"
15+
"phpunit/phpunit": "~4.8",
16+
"codacy/coverage": "^1.4"
1617
},
1718
"autoload": {
1819
"psr-0": { "Sabberworm\\CSS": "lib/" }

composer.lock

Lines changed: 278 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)