jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366794 )
Change subject: Use Wikibase CodeSniffer instead of mediawiki's
......................................................................
Use Wikibase CodeSniffer instead of mediawiki's
Bug: T167436
Change-Id: I2322b25e312eb2de9e7d6df8b51b2777e947d8be
---
M composer.json
M phpcs.xml
2 files changed, 6 insertions(+), 35 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/composer.json b/composer.json
index 8c9facf..146bf62 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "wikibase/wikibase-codesniffer": "^0.1.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/phpcs.xml b/phpcs.xml
index 18935bf..e6b08c2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,41 +1,12 @@
<?xml version="1.0"?>
<ruleset name="InterwikiSorting">
- <!-- See
https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
-->
- <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
- <exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
- <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
- <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
- </rule>
+ <rule ref="./vendor/wikibase/wikibase-codesniffer/Wikibase" />
- <rule ref="Generic.Files.InlineHTML" />
- <rule ref="Generic.Files.OneInterfacePerFile" />
- <rule ref="Generic.Files.OneTraitPerFile" />
+ <rule ref="Generic.Formatting.NoSpaceAfterCast" />
<rule ref="Generic.Metrics.CyclomaticComplexity" />
<rule ref="Generic.Metrics.NestingLevel" />
- <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
-
- <rule ref="PSR1" />
- <rule ref="PSR2.Files" />
-
- <rule ref="Squiz.Classes.DuplicateProperty" />
- <rule ref="Squiz.Classes.SelfMemberReference" />
- <rule ref="Squiz.ControlStructures.ControlSignature" />
- <rule ref="Squiz.Functions.FunctionDuplicateArgument" />
- <rule ref="Squiz.Functions.GlobalFunction" />
- <rule ref="Squiz.Scope" />
- <rule ref="Squiz.WhiteSpace.FunctionSpacing">
- <properties>
- <property name="spacing" value="1" />
- </properties>
- </rule>
- <rule ref="Squiz.WhiteSpace.OperatorSpacing">
- <properties>
- <property name="ignoreNewlines" value="true" />
- </properties>
- </rule>
+ <rule ref="Squiz.Operators.ValidLogicalOperators" />
<file>.</file>
- <arg name="extensions" value="php" />
- <arg name="encoding" value="utf8" />
- <exclude-pattern>vendor</exclude-pattern>
+ <exclude-pattern>node_modules</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/366794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2322b25e312eb2de9e7d6df8b51b2777e947d8be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InterwikiSorting
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
