jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360287 )
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.MissingParamTag
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
Change-Id: I1c980332fd63a4d86e08fea23c48d05e30d76fbb
---
M composer.json
M includes/WikidataPageBanner.functions.php
M includes/WikidataPageBanner.hooks.php
M phpcs.xml
M tests/phpunit/BannerTest.php
5 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 1c32a41..b7c16c4 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.7.2",
+ "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/WikidataPageBanner.functions.php
b/includes/WikidataPageBanner.functions.php
index 98e2ba1..95a00cf 100755
--- a/includes/WikidataPageBanner.functions.php
+++ b/includes/WikidataPageBanner.functions.php
@@ -140,7 +140,7 @@
* Returns the html code for the pagebanner
*
* @param string $bannername FileName of banner image
- * @param array $options additional parameters passed to template
+ * @param array $options additional parameters passed to template
* @return string|null Html code of the banner or null if invalid
bannername
*/
public static function getBannerHtml( $bannername, $options = [] ) {
diff --git a/includes/WikidataPageBanner.hooks.php
b/includes/WikidataPageBanner.hooks.php
index 9e065c9..c48c77e 100755
--- a/includes/WikidataPageBanner.hooks.php
+++ b/includes/WikidataPageBanner.hooks.php
@@ -84,9 +84,9 @@
if ( $out->getProperty( 'wpb-banner-options' ) !== null &&
!$isDiff ) {
$params = $out->getProperty( 'wpb-banner-options' );
$bannername = $params['name'];
- if ( isset( $params['icons'] ) ){
+ if ( isset( $params['icons'] ) ) {
$out->enableOOUI();
- $params['icons'] =
self::expandIconTemplateOptions( $params['icons'] );
+$params['icons'] = self::expandIconTemplateOptions( $params['icons'] );
}
$banner = $wpbFunctionsClass::getBannerHtml(
$bannername, $params );
// attempt to get an automatic banner
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..358f4f1 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,7 +1,11 @@
<?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.MissingParamTag" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+ </rule>
<file>.</file>
- <arg name="extensions" value="php"/>
+ <arg name="extensions" value="php" />
<exclude-pattern>vendor</exclude-pattern>
</ruleset>
diff --git a/tests/phpunit/BannerTest.php b/tests/phpunit/BannerTest.php
index 39f33f2..35e12f1 100644
--- a/tests/phpunit/BannerTest.php
+++ b/tests/phpunit/BannerTest.php
@@ -73,7 +73,6 @@
}
} catch ( Exception $e ) {
}
-
}
protected function setUp() {
--
To view, visit https://gerrit.wikimedia.org/r/360287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c980332fd63a4d86e08fea23c48d05e30d76fbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
