build: Updating mediawiki/mediawiki-codesniffer to 0.9.0

Change-Id: Ie27658bb7e8bb8bfc26b52f33fed796f8bfa2fda
isekai
Umherirrender 8 years ago
parent 7e17945639
commit 0822b4cf3e

4
.gitignore vendored

@ -1,3 +1,3 @@
/node_modules/ /node_modules
/vendor/ /vendor
/composer.lock /composer.lock

@ -9,7 +9,7 @@ class SkinTimeless extends SkinTemplate {
$template = 'TimelessTemplate', $useHeadElement = true; $template = 'TimelessTemplate', $useHeadElement = true;
/** /**
* @param $out OutputPage * @param OutputPage $out
*/ */
public function initPage( OutputPage $out ) { public function initPage( OutputPage $out ) {
parent::initPage( $out ); parent::initPage( $out );
@ -33,7 +33,7 @@ class SkinTimeless extends SkinTemplate {
/** /**
* Add CSS via ResourceLoader * Add CSS via ResourceLoader
* *
* @param $out OutputPage * @param OutputPage $out
*/ */
function setupSkinUserCss( OutputPage $out ) { function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out ); parent::setupSkinUserCss( $out );

@ -338,9 +338,12 @@ class TimelessTemplate extends BaseTemplate {
$sidebar = $this->getSidebar(); $sidebar = $this->getSidebar();
$html = ''; $html = '';
$sidebar['SEARCH'] = false; // Already hardcoded into header // Already hardcoded into header
$sidebar['TOOLBOX'] = false; // Parsed as part of pageTools $sidebar['SEARCH'] = false;
$sidebar['LANGUAGES'] = false; // Forcibly removed to separate chunk // Parsed as part of pageTools
$sidebar['TOOLBOX'] = false;
// Forcibly removed to separate chunk
$sidebar['LANGUAGES'] = false;
foreach ( $sidebar as $name => $content ) { foreach ( $sidebar as $name => $content ) {
if ( $content === false ) { if ( $content === false ) {
@ -647,7 +650,8 @@ class TimelessTemplate extends BaseTemplate {
] ) ) { ] ) ) {
$currentSet = 'page-secondary'; $currentSet = 'page-secondary';
} else { } else {
$currentSet = 'page-primary'; // Catch random extension ones? // Catch random extension ones?
$currentSet = 'page-primary';
} }
$sortedPileOfTools[$currentSet][$navKey] = $navBlock; $sortedPileOfTools[$currentSet][$navKey] = $navBlock;
} }
@ -822,7 +826,6 @@ class TimelessTemplate extends BaseTemplate {
$variants = ''; $variants = '';
} }
if ( $this->data['language_urls'] !== false ) { if ( $this->data['language_urls'] !== false ) {
$html .= $this->getSidebarChunk( $html .= $this->getSidebarChunk(
'other-languages', 'other-languages',
'timeless-languages', 'timeless-languages',

@ -31,14 +31,14 @@
"installer-name": "Timeless" "installer-name": "Timeless"
}, },
"require-dev": { "require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.*", "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" "jakub-onderka/php-console-highlighter": "0.3.2"
}, },
"scripts": { "scripts": {
"fix": "phpcbf", "fix": "phpcbf",
"test": [ "test": [
"parallel-lint . --exclude vendor", "parallel-lint . --exclude node_modules --exclude vendor",
"phpcs -p -s" "phpcs -p -s"
] ]
} }

@ -1,8 +1,11 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<ruleset> <ruleset>
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/> <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment"/>
</rule>
<file>.</file> <file>.</file>
<arg name="extensions" value="php,php5,inc"/> <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>vendor</exclude-pattern>
<exclude-pattern>node_modules</exclude-pattern>
</ruleset> </ruleset>

Loading…
Cancel
Save