jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368015 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I672d898640ae69d3a69ced62a2c78e7a1a157ccc
---
M composer.json
M includes/ApiQueryGlobalUsage.php
M includes/GlobalUsage.php
M includes/SpecialGloballyWantedFiles.php
M includes/SpecialMostGloballyLinkedFiles.php
M phpcs.xml
6 files changed, 12 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 4f55859..bf202bf 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/ApiQueryGlobalUsage.php b/includes/ApiQueryGlobalUsage.php
index 0c1ddc8..c3cbcea 100644
--- a/includes/ApiQueryGlobalUsage.php
+++ b/includes/ApiQueryGlobalUsage.php
@@ -24,7 +24,7 @@
class ApiQueryGlobalUsage extends ApiQueryBase {
public function __construct( $query, $moduleName ) {
- parent :: __construct( $query, $moduleName, 'gu' );
+ parent::__construct( $query, $moduleName, 'gu' );
}
public function execute() {
@@ -119,11 +119,11 @@
ApiBase::PARAM_ISMULTI => true,
],
'limit' => [
- ApiBase :: PARAM_DFLT => 10,
- ApiBase :: PARAM_TYPE => 'limit',
- ApiBase :: PARAM_MIN => 1,
- ApiBase :: PARAM_MAX => ApiBase :: LIMIT_BIG1,
- ApiBase :: PARAM_MAX2 => ApiBase :: LIMIT_BIG2
+ ApiBase::PARAM_DFLT => 10,
+ ApiBase::PARAM_TYPE => 'limit',
+ ApiBase::PARAM_MIN => 1,
+ ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
+ ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
],
'continue' => [
ApiBase::PARAM_HELP_MSG =>
'api-help-param-continue',
diff --git a/includes/GlobalUsage.php b/includes/GlobalUsage.php
index 8e5ff6e..51bbd39 100644
--- a/includes/GlobalUsage.php
+++ b/includes/GlobalUsage.php
@@ -218,7 +218,7 @@
* @note This assumes the user has a single shared repo. If the user has
* multiple/nested foreign repos, then its unclear what it means to
* be on the "shared repo". See discussion on bug 23136.
- * @return boolean
+ * @return bool
*/
public static function onSharedRepo() {
global $wgGlobalUsageSharedRepoWiki, $wgGlobalUsageDatabase;
diff --git a/includes/SpecialGloballyWantedFiles.php
b/includes/SpecialGloballyWantedFiles.php
index e389c3d..4e5620c 100644
--- a/includes/SpecialGloballyWantedFiles.php
+++ b/includes/SpecialGloballyWantedFiles.php
@@ -46,7 +46,7 @@
* Also make sure that GlobalUsage db same as shared repo.
* (To catch the unlikely case where GlobalUsage db is different db
from the
* shared repo db).
- * @return boolean
+ * @return bool
*/
function isCacheable() {
global $wgGlobalUsageDatabase;
@@ -57,7 +57,7 @@
/**
* Only list this special page on the wiki that is the shared repo.
*
- * @return boolean Should this be listed in Special:SpecialPages
+ * @return bool Should this be listed in Special:SpecialPages
*/
function isListed() {
return GlobalUsage::onSharedRepo();
diff --git a/includes/SpecialMostGloballyLinkedFiles.php
b/includes/SpecialMostGloballyLinkedFiles.php
index fea86e9..432c24f 100644
--- a/includes/SpecialMostGloballyLinkedFiles.php
+++ b/includes/SpecialMostGloballyLinkedFiles.php
@@ -27,7 +27,7 @@
/**
* Don't want to do cached handling on non-shared repo, since we only
redirect.
- * @return boolean
+ * @return bool
*/
function isCacheable() {
return GlobalUsage::onSharedRepo();
@@ -70,7 +70,7 @@
/**
* Only list this special page on the wiki that is the shared repo.
*
- * @return boolean Should this be listed in Special:SpecialPages
+ * @return bool Should this be listed in Special:SpecialPages
*/
function isListed() {
return GlobalUsage::onSharedRepo();
diff --git a/phpcs.xml b/phpcs.xml
index ad3edb3..e8a6782 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -13,6 +13,4 @@
<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>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/368015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I672d898640ae69d3a69ced62a2c78e7a1a157ccc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUsage
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
