jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351800 )
Change subject: Use Wikibase's CodeSniffer instead of MediaWiki's ...................................................................... Use Wikibase's CodeSniffer instead of MediaWiki's Same as Ifed1a4e and I1d2fe22. See https://github.com/wmde/WikibaseCodeSniffer/pull/1 for the TODO left in the local rules file. Change-Id: I6cde867b469ab7f2e0f5f1772f1a95e253f0f277 --- M WikibaseMediaInfo.i18n.alias.php M composer.json M phpcs.xml M tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php 4 files changed, 10 insertions(+), 43 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/WikibaseMediaInfo.i18n.alias.php b/WikibaseMediaInfo.i18n.alias.php index 069a42f..135d81e 100644 --- a/WikibaseMediaInfo.i18n.alias.php +++ b/WikibaseMediaInfo.i18n.alias.php @@ -10,5 +10,4 @@ $specialPageAliases = []; /** English (English) */ -$specialPageAliases['en'] = [ -]; +$specialPageAliases['en'] = []; diff --git a/composer.json b/composer.json index a8731b7..dccfabb 100644 --- a/composer.json +++ b/composer.json @@ -14,17 +14,17 @@ "irc": "irc://irc.freenode.net/wikidata" }, "require": { - "php": ">=5.5.0", + "php": ">=5.5.9", "serialization/serialization": "~3.2", "wikibase/data-model": "~7.0", "wikibase/data-model-serialization": "~2.0", "wikibase/data-model-services": "~3.6" }, "require-dev": { + "jakub-onderka/php-console-highlighter": "0.3.2", "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.6.0", "phpunit/phpunit": "~4.8", - "jakub-onderka/php-console-highlighter": "0.3.2" + "wikibase/wikibase-codesniffer": "^0.1.0" }, "autoload": { "psr-4": { diff --git a/phpcs.xml b/phpcs.xml index 92e77d4..6cbec74 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,47 +1,15 @@ <?xml version="1.0"?> <ruleset name="WikibaseMediaInfo"> - <!-- 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> + <rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase" /> - <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" /> - <rule ref="Generic.ControlStructures" /> - <rule ref="Generic.Files.InlineHTML" /> - <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> diff --git a/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php b/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php index 0a6d85c..4778128 100644 --- a/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php +++ b/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php @@ -147,7 +147,7 @@ [ '' ], [ [] ], [ [ 'foo' => 'bar' ] ], - [ [ 'type' => null ]], + [ [ 'type' => null ] ], [ [ 'type' => 'item' ] ] ]; } -- To view, visit https://gerrit.wikimedia.org/r/351800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6cde867b469ab7f2e0f5f1772f1a95e253f0f277 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> Gerrit-Reviewer: Addshore <[email protected]> Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
