jonny
/
Vector-Local
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Updating mediawiki/mediawiki-codesniffer to 0.9.0 

Change-Id: I5d9643f9a0dc33c05b7404a88209d244b4badae3
This commit is contained in:
Umherirrender 2017-06-23 22:06:01 +02:00
parent c48647267f
commit 40167a9335
3 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
VectorTemplate.php
View File

@ -322,7 +322,8 @@ class VectorTemplate extends BaseTemplate {
</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 @@ class VectorTemplate extends BaseTemplate {
<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 @@ class VectorTemplate extends BaseTemplate {
<?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' ]

6
composer.json
View File

@ -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"
]
}

9
phpcs.xml
View File

@ -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>