jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351648 )
Change subject: Use Wikibase's CodeSniffer instead of MediaWiki's ...................................................................... Use Wikibase's CodeSniffer instead of MediaWiki's Same as Ifed1a4e. See https://github.com/wmde/WikibaseCodeSniffer/pull/1 for the TODO left in the local rules file. Change-Id: I1d2fe227f03b5636fed68e9f65042268b120bc90 --- M composer.json M phpcs.xml 2 files changed, 11 insertions(+), 39 deletions(-) Approvals: Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 1cd15af..3672571 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "irc": "irc://irc.freenode.net/wikidata" }, "require": { - "php": ">=5.5.0", + "php": ">=5.5.9", "serialization/serialization": "~3.2", "wikimedia/assert": "~0.2.2", "wikibase/data-model": "^7.0", @@ -23,8 +23,8 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.7.2", - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "~4.8", + "wikibase/wikibase-codesniffer": "^0.1.0" }, "autoload": { "psr-4": { diff --git a/phpcs.xml b/phpcs.xml index 7f79f05..3199abd 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,50 +1,22 @@ <?xml version="1.0"?> <ruleset name="WikibaseLexeme"> - <!-- See https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml --> - <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"> - <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment" /> + <rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase"> </rule> - <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" /> - <rule ref="Generic.ControlStructures" /> - <rule ref="Generic.Files.InlineHTML" /> + <!-- Exceptions --> + <rule ref="Generic.Files.LineLength"> <exclude-pattern>resources/templates\.php</exclude-pattern> </rule> - <rule ref="Generic.Files.OneInterfacePerFile" /> - <rule ref="Generic.Files.OneTraitPerFile" /> + + <!-- Additions --> + + <!-- Metrics are intentionally not part of the base Wikibase CodeSniffer rule set. --> <rule ref="Generic.Metrics.CyclomaticComplexity" /> <rule ref="Generic.Metrics.NestingLevel" /> - <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" /> - <rule ref="PSR1" /> - <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"> - <!-- Exclude test methods like "testGivenInvalidInput_methodThrowsException". --> - <exclude-pattern>tests/phpunit/*Test\.php</exclude-pattern> - </rule> - - <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" /> + <!-- TODO: Move to the Wikibase CodeSniffer library. --> <rule ref="Squiz.WhiteSpace.CastSpacing" /> - <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> <file>.</file> - <arg name="extensions" value="php" /> - <arg name="encoding" value="utf8" /> - <exclude-pattern>vendor</exclude-pattern> </ruleset> -- To view, visit https://gerrit.wikimedia.org/r/351648 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d2fe227f03b5636fed68e9f65042268b120bc90 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseLexeme Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]> Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
