jenkins-bot has submitted this change and it was merged.
Change subject: Update mediawiki-codesniffer and parallel-lint settings
......................................................................
Update mediawiki-codesniffer and parallel-lint settings
Change-Id: I6da9471df6448ab02aa6cc49cd85705a5f7014a1
---
M composer.json
M phpcs.xml
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 969895a..4365e8a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
{
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.*",
+ "jakub-onderka/php-parallel-lint": "0.9",
"mediawiki/mediawiki-codesniffer": "0.4.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
- "phpcs -p"
+ "phpcs -p -s"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..d81a292 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,7 @@
<ruleset>
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
<file>.</file>
- <arg name="extensions" value="php"/>
+ <arg name="extensions" value="php,php5,inc"/>
+ <arg name="encoding" value="utf8"/>
<exclude-pattern>vendor</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/241983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6da9471df6448ab02aa6cc49cd85705a5f7014a1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
