jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361109 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
---
M .gitignore
M MonoBookTemplate.php
M composer.json
M phpcs.xml
4 files changed, 17 insertions(+), 19 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 53bbca6..087740f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
sftp-config.json
# Building & testing
-node_modules/
+/node_modules
# Composer
/vendor
diff --git a/MonoBookTemplate.php b/MonoBookTemplate.php
index 6625e52..ac6aae6 100644
--- a/MonoBookTemplate.php
+++ b/MonoBookTemplate.php
@@ -72,7 +72,7 @@
<?php if ( $this->data['undelete'] ) {
?>
<div id="contentSub2"><?php
$this->html( 'undelete' ) ?></div>
<?php
-}
+ }
?><?php
if ( $this->data['newtalk'] ) {
?>
@@ -117,7 +117,6 @@
<div class="pBody">
<ul<?php $this->html(
'userlangattributes' ) ?>>
<?php
-
$personalTools =
$this->getPersonalTools();
if ( array_key_exists( 'uls',
$personalTools ) ) {
@@ -126,8 +125,8 @@
}
if (
!$this->getSkin()->getUser()->isLoggedIn() &&
-
User::groupHasPermission( '*', 'edit' ) ) {
-
+
User::groupHasPermission( '*', 'edit' )
+ ) {
echo Html::rawElement(
'li', [
'id' =>
'pt-anonuserpage'
], $this->getMsg(
'notloggedin' )->escaped() );
@@ -159,7 +158,8 @@
<div class="visualClear"></div>
<?php
$validFooterIcons = $this->getFooterIcons( 'icononly' );
- $validFooterLinks = $this->getFooterLinks( 'flat' ); //
Additional footer links
+ // Additional footer links
+ $validFooterLinks = $this->getFooterLinks( 'flat' );
if ( count( $validFooterIcons ) + count( $validFooterLinks ) >
0 ) {
?>
@@ -177,7 +177,7 @@
<?php echo
$this->getSkin()->makeFooterIcon( $icon ); ?>
<?php
-}
+ }
?>
</div>
<?php
@@ -206,9 +206,7 @@
echo Html::closeElement( 'body' );
echo Html::closeElement( 'html' );
echo "\n";
- } // end of execute() method
-
-
/*************************************************************************************************/
+ }
/**
* @param array $sidebar
@@ -305,7 +303,6 @@
<?php
}
-
/*************************************************************************************************/
function toolbox() {
?>
<div class="portlet" id="p-tb" role="navigation">
@@ -331,7 +328,6 @@
Hooks::run( 'MonoBookAfterToolbox' );
}
-
/*************************************************************************************************/
function languageBox() {
if ( $this->data['language_urls'] !== false ) {
?>
@@ -344,7 +340,7 @@
<?php echo
$this->makeListItem( $key, $langLink ); ?>
<?php
-}
+ }
?>
</ul>
@@ -355,7 +351,6 @@
}
}
-
/*************************************************************************************************/
/**
* @param string $bar
* @param array|string $cont
@@ -402,4 +397,4 @@
</div>
<?php
}
-} // end of class
+}
diff --git a/composer.json b/composer.json
index 1ef4ea4..5243c66 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
{
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9",
+ "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..0903898 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment"/>
+ <exclude name="MediaWiki.FunctionComment.Missing.Public"/>
+ </rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
- <arg name="encoding" value="utf8"/>
+ <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/361109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3820f0aff53b881d17ccd4997bcc1bef0ae11da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MonoBook
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
