Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361112 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
Change-Id: I5d9643f9a0dc33c05b7404a88209d244b4badae3
---
M VectorTemplate.php
M composer.json
M phpcs.xml
3 files changed, 26 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector
refs/changes/12/361112/1
diff --git a/VectorTemplate.php b/VectorTemplate.php
index 932f636..234e015 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -322,7 +322,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 );
@@ -499,18 +500,16 @@
<h3 id="p-personal-label"><?php
$this->msg( 'personaltools' ) ?></h3>
<ul<?php $this->html(
'userlangattributes' ) ?>>
<?php
-
$notLoggedIn = '';
if (
!$this->getSkin()->getUser()->isLoggedIn() &&
-
User::groupHasPermission( '*', 'edit' ) ){
-
+
User::groupHasPermission( '*', 'edit' )
+ ) {
$notLoggedIn =
Html::rawElement( 'li',
[ 'id' => 'pt-anonuserpage' ],
$this->getMsg( 'notloggedin' )->escaped()
);
-
}
$personalTools =
$this->getPersonalTools();
@@ -551,17 +550,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/composer.json b/composer.json
index 8cc968e..a1abb79 100644
--- a/composer.json
+++ b/composer.json
@@ -34,14 +34,14 @@
"installer-name": "Vector"
},
"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..a26dbbe 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,13 @@
<?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"/>
+ </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/361112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d9643f9a0dc33c05b7404a88209d244b4badae3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
