jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361107 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
Change-Id: I8a0430a2f8c1ab286ea0e6203d67b61fb70f3e2c
---
M MetrolookTemplate.php
M SkinMetrolook.php
M composer.json
M phpcs.xml
4 files changed, 29 insertions(+), 21 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 4dcfd90..3939df5 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -99,7 +99,8 @@
);
if ( $this->config->get( 'MetrolookDisableAvatar' ) ) {
- if ( class_exists( 'wAvatar' ) ) { // SocialProfile is
installed
+ if ( class_exists( 'wAvatar' ) ) {
+ // SocialProfile is installed
$avatar = new wAvatar(
$skin->getUser()->getId(), 'l' );
$avatarImage = $avatar->getAvatarURL( [
'width' => (int)$width,
@@ -445,8 +446,7 @@
if (
isset(
$this->data['nav_urls']['upload']['href'] ) &&
$this->data['nav_urls']['upload']['href']
- )
- {
+ ) {
$uploadURL =
$this->data['nav_urls']['upload']['href'];
} else {
$upURL =
SpecialPage::getTitleFor( 'Upload' )->getFullURL();
@@ -638,7 +638,8 @@
</ul>
<?php
} else {
- echo $content; /* Allow raw HTML block
to be defined by extensions */
+ // Allow raw HTML block to be defined
by extensions
+ echo $content;
}
$this->renderAfterPortlet( $name );
@@ -835,17 +836,18 @@
<?php
echo
$this->makeSearchInput( [ 'id' => 'searchInput' ] );
echo Html::hidden(
'title', $this->get( 'searchtitle' ) );
- // We construct two
buttons (for 'go' and 'fulltext' search modes),
- // but only one will be
visible and actionable at a time (they are
- // overlaid on top of
each other in CSS).
- // * Browsers will use
the 'fulltext' one by default (as it's the
- // first in
tree-order), which is desirable when they are unable
- // to show search
suggestions (either due to being broken or
- // having JavaScript
turned off).
- // * The
mediawiki.searchSuggest module, after doing tests for the
- // broken browsers,
removes the 'fulltext' button and handles
- // 'fulltext' search
itself; this will reveal the 'go' button and
- // cause it to be
used.
+ /* We construct two
buttons (for 'go' and 'fulltext' search modes),
+ * but only one will be
visible and actionable at a time (they are
+ * overlaid on top of
each other in CSS).
+ * * Browsers will use
the 'fulltext' one by default (as it's the
+ * first in
tree-order), which is desirable when they are unable
+ * to show search
suggestions (either due to being broken or
+ * having JavaScript
turned off).
+ * * The
mediawiki.searchSuggest module, after doing tests for the
+ * broken browsers,
removes the 'fulltext' button and handles
+ * 'fulltext' search
itself; this will reveal the 'go' button and
+ * cause it to be
used.
+ */
echo
$this->makeSearchButton(
'fulltext',
[ 'id' =>
'mw-searchButton', 'class' => 'searchButton mw-fallbackSearchButton' ]
diff --git a/SkinMetrolook.php b/SkinMetrolook.php
index 3cb25ea..b4c954a 100644
--- a/SkinMetrolook.php
+++ b/SkinMetrolook.php
@@ -43,7 +43,6 @@
* @param OutputPage $out Object to initialize
*/
public function initPage( OutputPage $out ) {
-
parent::initPage( $out );
if ( $this->metrolookConfig->get( 'MetrolookMobile' ) ) {
diff --git a/composer.json b/composer.json
index 65cf760..5fd68b0 100644
--- a/composer.json
+++ b/composer.json
@@ -33,14 +33,14 @@
"installer-name": "Metrolook"
},
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.*",
- "mediawiki/mediawiki-codesniffer": "0.7.2",
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.9.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
"fix": "phpcbf",
"test": [
- "parallel-lint . --exclude vendor",
+ "parallel-lint . --exclude node_modules --exclude
vendor",
"phpcs -p -s"
]
}
diff --git a/phpcs.xml b/phpcs.xml
index d81a292..2e2aa0a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,15 @@
<?xml version="1.0"?>
<ruleset>
- <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch"/>
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamTag"/>
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamComment"/>
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingParamName"/>
+ <exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn"/>
+ </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/361107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a0430a2f8c1ab286ea0e6203d67b61fb70f3e2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Metrolook
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: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
