Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/330397 )
Change subject: Update PHPCS to be more similar to other Wikibase code repositories ...................................................................... Update PHPCS to be more similar to other Wikibase code repositories This is an untouched copy (except for the name) from WikibaseLexeme. Change-Id: Idef8f315ff62d8e9623cc4de5a4ccff8a6d4a067 --- M phpcs.xml M src/Actions/ViewMediaInfoAction.php M src/Services/MediaInfoIdLookup.php 3 files changed, 49 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseMediaInfo refs/changes/97/330397/1 diff --git a/phpcs.xml b/phpcs.xml index d81a292..92e77d4 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,8 +1,47 @@ <?xml version="1.0"?> -<ruleset> - <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/> +<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="Generic.CodeAnalysis.UnconditionalIfStatement" /> + <rule ref="Generic.ControlStructures" /> + <rule ref="Generic.Files.InlineHTML" /> + <rule ref="Generic.Files.OneInterfacePerFile" /> + <rule ref="Generic.Files.OneTraitPerFile" /> + <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" /> + <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,php5,inc"/> - <arg name="encoding" value="utf8"/> + <arg name="extensions" value="php" /> + <arg name="encoding" value="utf8" /> <exclude-pattern>vendor</exclude-pattern> </ruleset> diff --git a/src/Actions/ViewMediaInfoAction.php b/src/Actions/ViewMediaInfoAction.php index 6f790c4..fbfb610 100644 --- a/src/Actions/ViewMediaInfoAction.php +++ b/src/Actions/ViewMediaInfoAction.php @@ -14,8 +14,12 @@ */ class ViewMediaInfoAction extends ViewEntityAction { - function show() { + /** + * @see ViewEntityAction::show + */ + public function show() { parent::show(); + $this->getOutput()->addModules( 'wikibase.mediainfo.mediainfoview' ); } diff --git a/src/Services/MediaInfoIdLookup.php b/src/Services/MediaInfoIdLookup.php index 4f094f6..fbbba5d 100644 --- a/src/Services/MediaInfoIdLookup.php +++ b/src/Services/MediaInfoIdLookup.php @@ -50,4 +50,5 @@ return null; } } + } -- To view, visit https://gerrit.wikimedia.org/r/330397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idef8f315ff62d8e9623cc4de5a4ccff8a6d4a067 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo 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
