jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360258 )
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.MissingReturn
* MediaWiki.Commenting.FunctionComment.ParamNameNoMatch
* MediaWiki.FunctionComment.Missing.Protected
* MediaWiki.FunctionComment.Missing.Public
* MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName
Change-Id: Id312ef807c96dd1baca14f5eca9a193d1c69225f
---
M SiteMatrix_body.php
M SpecialSiteMatrix.php
M composer.json
M phpcs.xml
4 files changed, 17 insertions(+), 10 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SiteMatrix_body.php b/SiteMatrix_body.php
index 8111027..0c83b99 100644
--- a/SiteMatrix_body.php
+++ b/SiteMatrix_body.php
@@ -404,7 +404,6 @@
&$magicWordId,
&$ret,
$frame = null )
{
-
if ( $magicWordId == 'numberofwikis' ) {
global $wgLocalDatabases;
$ret = count( $wgLocalDatabases );
diff --git a/SpecialSiteMatrix.php b/SpecialSiteMatrix.php
index ccec446..5512dec 100644
--- a/SpecialSiteMatrix.php
+++ b/SpecialSiteMatrix.php
@@ -51,18 +51,18 @@
if ( isset( $langNames[$lang] ) ) {
$langDisplay = Html::rawElement( 'span',
- [ 'lang' =>
htmlspecialchars( $lang ) ],
-
$langNames[$lang] );
+ [ 'lang' => htmlspecialchars( $lang ) ],
+ $langNames[$lang] );
} else {
$langDisplay = '';
}
if ( isset( $localLanguageNames[$lang] ) &&
strlen( $localLanguageNames[$lang] ) &&
- $langDisplay != $localLanguageNames[$lang] ) {
-
+ $langDisplay != $localLanguageNames[$lang]
+ ) {
$langDisplay .= $this->msg( 'word-separator'
)->text() .
- $this->msg( 'parentheses',
$localLanguageNames[$lang] )->text();
+ $this->msg( 'parentheses',
$localLanguageNames[$lang] )->text();
}
$s .= '<td>' . $anchor . Html::rawElement( 'strong',
$attribs, $langDisplay ) . '</td>';
diff --git a/composer.json b/composer.json
index e70316e..3698cef 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,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/phpcs.xml b/phpcs.xml
index d81a292..e6dd5ed 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,16 @@
<?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.MissingReturn" />
+ <exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+ <exclude name="MediaWiki.FunctionComment.Missing.Protected" />
+ <exclude name="MediaWiki.FunctionComment.Missing.Public" />
+ <exclude
name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
+ </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>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/360258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id312ef807c96dd1baca14f5eca9a193d1c69225f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SiteMatrix
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
