Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249987
Change subject: Switch to the MediaWiki code sniffer rule set
......................................................................
Switch to the MediaWiki code sniffer rule set
I wanted this patch to be as small as possible. I will continue working
on this in later patches:
* Remove all redundant rules that are already enabled via the MediaWiki
rule set.
* Start fixing the disabled whitespace rules, one by one.
Change-Id: Ia39a60580679d2ec41ea4d6e72637abb96e5faa8
---
M composer.json
M phpcs.xml
2 files changed, 30 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/87/249987/1
diff --git a/composer.json b/composer.json
index 32f0089..ca58692 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
"diff/diff": "~2.0"
},
"require-dev": {
- "squizlabs/php_codesniffer": "~2.1"
+ "mediawiki/mediawiki-codesniffer": "0.4.0"
},
"conflict": {
"mediawiki/mediawiki": "<1.23"
diff --git a/phpcs.xml b/phpcs.xml
index 64d44db..0e790a3 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
-<!--
- For now this is mostly a subset of MediaWiki core's rule set, see
-
https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
--->
-<ruleset name="MediaWiki">
+<ruleset name="Wikibase">
+ <!-- See
https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
-->
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
+
+ <rule ref="Generic.Classes.DuplicateClassName.Found">
+
<exclude-pattern>DataAccess*Scribunto*Scribunto_LuaWikibaseLibraryTestCase\.php</exclude-pattern>
+ </rule>
<rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" />
<rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
@@ -50,6 +52,28 @@
<rule ref="Generic.PHP.NoSilencedErrors" />
<rule ref="Generic.PHP.SAPIUsage" />
+ <!-- FIXME: This is part of the MediaWiki rule set and should be fixed.
-->
+ <rule ref="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed">
+ <severity>0</severity>
+ </rule>
+
+ <!-- FIXME: All these disabled MediaWiki rules indicate errors that
should be fixed. -->
+ <rule
ref="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment">
+ <severity>0</severity>
+ </rule>
+ <rule
ref="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment">
+ <severity>0</severity>
+ </rule>
+ <rule
ref="MediaWiki.WhiteSpace.SpaceyParenthesis.SpaceBeforeOpeningParenthesis">
+ <severity>0</severity>
+ </rule>
+ <rule
ref="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis">
+ <severity>0</severity>
+ </rule>
+ <rule
ref="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis">
+ <severity>0</severity>
+ </rule>
+
<rule ref="PSR1" />
<rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
<exclude-pattern>DataAccess*Scribunto*Scribunto_LuaWikibaseLibraryTestCase\.php</exclude-pattern>
--
To view, visit https://gerrit.wikimedia.org/r/249987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia39a60580679d2ec41ea4d6e72637abb96e5faa8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
