jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/360156 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0 ...................................................................... build: Updating mediawiki/mediawiki-codesniffer to 0.9.0 The following sniffs are failing and were disabled: * MediaWiki.Commenting.FunctionComment.MissingParamComment * MediaWiki.Commenting.FunctionComment.MissingParamName * MediaWiki.Commenting.FunctionComment.MissingParamTag * MediaWiki.Commenting.FunctionComment.MissingReturn * MediaWiki.Commenting.FunctionComment.ParamNameNoMatch * MediaWiki.FunctionComment.Missing.Public * MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment Change-Id: I0cee32f6c99341be2c1710b1a15f5e042b5fdaf7 --- M .gitignore M FeaturedFeeds.body.php M composer.json M phpcs.xml 4 files changed, 17 insertions(+), 8 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index e65c3c5..d6192df 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .*.swp node_modules/ /vendor +composer.lock diff --git a/FeaturedFeeds.body.php b/FeaturedFeeds.body.php index 8ad41be..8779aad 100755 --- a/FeaturedFeeds.body.php +++ b/FeaturedFeeds.body.php @@ -118,9 +118,9 @@ global $wgDisplayFeedsInSidebar, $wgAdvertisedFeedTypes; if ( ( $wgDisplayFeedsInSidebar - || !wfMessage( 'ffeed-enable-sidebar-links' )->inContentLanguage()->isDisabled() ) - && $sk->getContext()->getTitle()->isMainPage() ) - { + || !wfMessage( 'ffeed-enable-sidebar-links' )->inContentLanguage()->isDisabled() + ) && $sk->getContext()->getTitle()->isMainPage() + ) { $feeds = self::getFeeds( $sk->getContext()->getLanguage()->getCode() ); $links = []; $format = $wgAdvertisedFeedTypes[0]; // @fixme: diff --git a/composer.json b/composer.json index b8f68fb..4a8c744 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", - "mediawiki/mediawiki-codesniffer": "0.7.2" + "mediawiki/mediawiki-codesniffer": "0.9.0" }, "scripts": { "fix": "phpcbf", diff --git a/phpcs.xml b/phpcs.xml index ede6c5d..1900714 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,9 +1,17 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> <ruleset> - <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/> + <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"> + <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" /> + <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" /> + <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" /> + <exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" /> + <exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" /> + <exclude name="MediaWiki.FunctionComment.Missing.Public" /> + <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" /> + </rule> <file>.</file> - <arg name="extensions" value="php,php5,inc"/> - <arg name="encoding" value="utf8"/> + <arg name="extensions" value="php,php5,inc" /> + <arg name="encoding" value="UTF-8" /> <exclude-pattern>vendor</exclude-pattern> <exclude-pattern>node_modules</exclude-pattern> </ruleset> -- To view, visit https://gerrit.wikimedia.org/r/360156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0cee32f6c99341be2c1710b1a15f5e042b5fdaf7 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/FeaturedFeeds Gerrit-Branch: master Gerrit-Owner: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits