jenkins-bot has submitted this change and it was merged.
Change subject: Update to PHPUnit 4.6 and PHPCS 2.2
......................................................................
Update to PHPUnit 4.6 and PHPCS 2.2
* New in phpcs 2.0: phpcs.xml config file.
* Ensure phpunit-coverage is limited to src/ and does not
include vendor/ or test/ etc.
Change-Id: Iaef371984893fb0a65aa51dfcc97babfcdbaa449
---
M .gitignore
M composer.json
A phpcs.xml
M phpunit.xml.dist
4 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 1dd7ea5..f6f384e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/coverage
/doc/html
vendor/
composer.lock
diff --git a/composer.json b/composer.json
index e270683..364acca 100644
--- a/composer.json
+++ b/composer.json
@@ -21,15 +21,15 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.8.*",
- "phpunit/phpunit": "4.4.*",
- "squizlabs/php_codesniffer": "2.1.*",
+ "phpunit/phpunit": "4.6.*",
+ "squizlabs/php_codesniffer": "2.2.*",
"mediawiki/mediawiki-codesniffer": "0.1.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
"phpunit $PHPUNIT_ARGS",
- "phpcs $PHPCS_ARGS
--standard=vendor/mediawiki/mediawiki-codesniffer/MediaWiki --ignore=vendor -v
."
+ "phpcs -v"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..e086bd4
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="CDB">
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <file>.</file>
+ <exclude-pattern>coverage</exclude-pattern>
+ <exclude-pattern>vendor</exclude-pattern>
+ <exclude-pattern>doc/html</exclude-pattern>
+</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 85058ed..45df427 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,4 +7,9 @@
<directory>./test</directory>
</testsuite>
</testsuites>
+ <filter>
+ <whitelist addUncoveredFilesFromWhitelist="true">
+ <directory suffix=".php">./src</directory>
+ </whitelist>
+ </filter>
</phpunit>
--
To view, visit https://gerrit.wikimedia.org/r/201973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaef371984893fb0a65aa51dfcc97babfcdbaa449
Gerrit-PatchSet: 2
Gerrit-Project: cdb
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
