Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372226 )
Change subject: build: Update require-dev, enable coverage, update Travis image
......................................................................
build: Update require-dev, enable coverage, update Travis image
* Use dist:trusty instead of deprecated default (dist:precise).
* Update lint and phpunit versions.
* Enable coverage-html by default so that things like @covers
are validated on each commit, instead of only post-merge.
Change-Id: Ib576d96d93dd5599529275258f0c621b541a2e44
---
M .gitignore
M .travis.yml
M composer.json
M phpunit.xml.dist
4 files changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/utfnormal refs/changes/26/372226/1
diff --git a/.gitignore b/.gitignore
index 3a761dd..78c4877 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
+/composer.lock
/coverage
/doc
-vendor
-composer.lock
+/vendor
diff --git a/.travis.yml b/.travis.yml
index 5ec3af6..e5c8358 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
sudo: false
language: php
+dist: trusty
php:
- "5.5"
- "5.6"
diff --git a/composer.json b/composer.json
index 9e7b1cf..fb31a0b 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
"php": ">=5.5.9"
},
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.*",
- "phpunit/phpunit": "4.6.*",
+ "jakub-onderka/php-parallel-lint": "^0.9.2",
+ "phpunit/phpunit": "^4.8",
"mediawiki/mediawiki-codesniffer": "0.4.0",
"ext-mbstring": "*"
},
@@ -27,7 +27,7 @@
"generate": "php scripts/generate.php",
"test": [
"parallel-lint . --exclude vendor",
- "phpunit $PHPUNIT_ARGS",
+ "phpunit",
"phpcs -p -s",
"php scripts/benchmark.php"
]
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 9fbb419..c2f5d42 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,4 +11,7 @@
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
+ <logging>
+ <log type="coverage-html" target="./coverage"/>
+ </logging>
</phpunit>
--
To view, visit https://gerrit.wikimedia.org/r/372226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib576d96d93dd5599529275258f0c621b541a2e44
Gerrit-PatchSet: 1
Gerrit-Project: utfnormal
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
