Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367436 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: Icba559465885af1169a1912f501bed56eea23ad9
---
M composer.json
M includes/skins/ICustomizableSkin.php
M includes/skins/MenuBuilder.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M phpcs.xml
6 files changed, 18 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/36/367436/1
diff --git a/composer.json b/composer.json
index 1366381..55507be 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/skins/ICustomizableSkin.php
b/includes/skins/ICustomizableSkin.php
index 69467bc..83623cc 100644
--- a/includes/skins/ICustomizableSkin.php
+++ b/includes/skins/ICustomizableSkin.php
@@ -10,7 +10,7 @@
/**
* Return whether a skin option is truthy
* @param string $key
- * @return boolean
+ * @return bool
*/
public function getSkinOption( $key );
}
diff --git a/includes/skins/MenuBuilder.php b/includes/skins/MenuBuilder.php
index 12f0992..8d7b59c 100644
--- a/includes/skins/MenuBuilder.php
+++ b/includes/skins/MenuBuilder.php
@@ -39,7 +39,7 @@
* Insert an entry into the menu.
*
* @param string $name A unique name identifying the menu entry
- * @param boolean [$isJSOnly] Whether the menu entry works without JS
+ * @param bool [$isJSOnly] Whether the menu entry works without JS
* @throws DomainException When the entry already exists
* @return MenuEntry
*/
@@ -77,7 +77,7 @@
* @param string $targetName The name of the existing entry to insert
* the new entry after
* @param string $name The name of the new entry
- * @param boolean [$isJSOnly] Whether the entry works without JS
+ * @param bool [$isJSOnly] Whether the entry works without JS
* @throws DomainException When the existing entry doesn't exist
* @return MenuEntry
*/
@@ -109,7 +109,7 @@
/**
* @param string $name
- * @param boolean $isJSOnly Whether the entry works without JS
+ * @param bool $isJSOnly Whether the entry works without JS
*/
public function __construct( $name, $isJSOnly ) {
$this->name = $name;
@@ -128,7 +128,7 @@
* Gets whether the entry should only be shown if JavaScript is disabled
* in the client.
*
- * @return boolean
+ * @return bool
*/
public function isJSOnly() {
return $this->isJSOnly;
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 41c76d8..e804da3 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -7,13 +7,13 @@
* Extended Template class of BaseTemplate for mobile devices
*/
class MinervaTemplate extends BaseTemplate {
- /** @var boolean Specify whether the page is a special page */
+ /** @var bool Specify whether the page is a special page */
protected $isSpecialPage;
- /** @var boolean Whether or not the user is on the Special:MobileMenu
page */
+ /** @var bool Whether or not the user is on the Special:MobileMenu page
*/
protected $isSpecialMobileMenuPage;
- /** @var boolean Specify whether the page is main page */
+ /** @var bool Specify whether the page is main page */
protected $isMainPage;
/**
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 85ed2de..56197b9 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -24,7 +24,7 @@
public $skinname = 'minerva';
/** @var string $template Name of this used template */
public $template = 'MinervaTemplate';
- /** @var boolean $useHeadElement Specify whether show head elements */
+ /** @var bool $useHeadElement Specify whether show head elements */
public $useHeadElement = true;
/** @var ContentHandler Content handler of page; only access through
getContentHandler */
protected $contentHandler = null;
@@ -92,7 +92,7 @@
/**
* Return whether a skin option is truthy
* @param string $key
- * @return boolean
+ * @return bool
*/
public function getSkinOption( $key ) {
return $this->skinOptions[$key];
@@ -189,7 +189,7 @@
* is truthy.
*
* @param string $action
- * @return boolean
+ * @return bool
*/
protected function isAllowedPageAction( $action ) {
$title = $this->getTitle();
@@ -1137,7 +1137,7 @@
* This is mostly the same check that sets wgIsProbablyEditable later
in the page output
* process.
*
- * @return boolean
+ * @return bool
*/
protected function isCurrentPageEditableByUser() {
$title = $this->getTitle();
@@ -1152,7 +1152,7 @@
* This is mostly the same check that sets wgIsProbablyEditable later
in the page output
* process.
*
- * @return boolean
+ * @return bool
*/
protected function isCurrentPageContentModelEditable() {
$contentHandler = $this->getContentHandler();
@@ -1214,7 +1214,7 @@
/**
* Returns true, if the page can have a talk page and user is logged in.
- * @return boolean
+ * @return bool
*/
protected function isTalkAllowed() {
$title = $this->getTitle();
@@ -1226,7 +1226,7 @@
/*
* Returns true, if the talk page of this page is wikitext-based.
- * @return boolean
+ * @return bool
*/
protected function isWikiTextTalkPage() {
$title = $this->getTitle();
diff --git a/phpcs.xml b/phpcs.xml
index 9338fbc..01ee7b1 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,14 +15,12 @@
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>
- <exclude-pattern>vendor</exclude-pattern>
- <exclude-pattern>node_modules</exclude-pattern>
<rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
<properties>
<property name="equalsSpacing" value="1" />
- <property name="requiredSpacesAfterOpen"
value="1"/>
- <property name="requiredSpacesBeforeClose"
value="1" />
+ <property name="requiredSpacesAfterOpen" value="1"/>
+ <property name="requiredSpacesBeforeClose" value="1" />
</properties>
</rule>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/367436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icba559465885af1169a1912f501bed56eea23ad9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
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
