Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361111 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.9.0
Change-Id: Ie27658bb7e8bb8bfc26b52f33fed796f8bfa2fda
---
M .gitignore
M Timeless.skin.php
M TimelessTemplate.php
M composer.json
M phpcs.xml
5 files changed, 20 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless
refs/changes/11/361111/1
diff --git a/.gitignore b/.gitignore
index 47e36d5..db8a779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/node_modules/
-/vendor/
+/node_modules
+/vendor
/composer.lock
diff --git a/Timeless.skin.php b/Timeless.skin.php
index d5e4618..f76e670 100644
--- a/Timeless.skin.php
+++ b/Timeless.skin.php
@@ -9,7 +9,7 @@
$template = 'TimelessTemplate', $useHeadElement = true;
/**
- * @param $out OutputPage
+ * @param OutputPage $out
*/
public function initPage( OutputPage $out ) {
parent::initPage( $out );
@@ -33,7 +33,7 @@
/**
* Add CSS via ResourceLoader
*
- * @param $out OutputPage
+ * @param OutputPage $out
*/
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index 6a45282..f22e5d5 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -338,9 +338,12 @@
$sidebar = $this->getSidebar();
$html = '';
- $sidebar['SEARCH'] = false; // Already hardcoded into header
- $sidebar['TOOLBOX'] = false; // Parsed as part of pageTools
- $sidebar['LANGUAGES'] = false; // Forcibly removed to separate
chunk
+ // Already hardcoded into header
+ $sidebar['SEARCH'] = false;
+ // Parsed as part of pageTools
+ $sidebar['TOOLBOX'] = false;
+ // Forcibly removed to separate chunk
+ $sidebar['LANGUAGES'] = false;
foreach ( $sidebar as $name => $content ) {
if ( $content === false ) {
@@ -647,7 +650,8 @@
] ) ) {
$currentSet = 'page-secondary';
} else {
- $currentSet = 'page-primary'; // Catch random
extension ones?
+ // Catch random extension ones?
+ $currentSet = 'page-primary';
}
$sortedPileOfTools[$currentSet][$navKey] = $navBlock;
}
@@ -822,7 +826,6 @@
$variants = '';
}
if ( $this->data['language_urls'] !== false ) {
-
$html .= $this->getSidebarChunk(
'other-languages',
'timeless-languages',
diff --git a/composer.json b/composer.json
index f5a983a..b0d45ec 100644
--- a/composer.json
+++ b/composer.json
@@ -31,14 +31,14 @@
"installer-name": "Timeless"
},
"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..eecaea2 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,11 @@
<?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"/>
+ </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/361111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie27658bb7e8bb8bfc26b52f33fed796f8bfa2fda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
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
