jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385565 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 14.1.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 14.1.0
And moved phpcs.xml to .phpcs.xml (T177256).
Change-Id: Id538f71c9343912e5372d8cfc2d3bdd3db37b584
---
R .phpcs.xml
M composer.json
M includes/CentralAuthUser.php
M includes/specials/SpecialGlobalRenameRequest.php
4 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/phpcs.xml b/.phpcs.xml
similarity index 100%
rename from phpcs.xml
rename to .phpcs.xml
diff --git a/composer.json b/composer.json
index 9a19236..3edd3dd 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": "13.0.0"
+ "mediawiki/mediawiki-codesniffer": "14.1.0"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index 19eb724..e2705d0 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -545,12 +545,12 @@
}
/**
- * Return the local user account ID of the user with the same name on
given wiki,
- * irrespective of whether it is attached or not
- * @param string $wikiId ID for the local database to connect to
- * @return int|null Local user ID for given $wikiID. Null if $wikiID is
invalid or local user
- * doesn't exist
- */
+ * Return the local user account ID of the user with the same name on
given wiki,
+ * irrespective of whether it is attached or not
+ * @param string $wikiId ID for the local database to connect to
+ * @return int|null Local user ID for given $wikiID. Null if $wikiID is
invalid or local user
+ * doesn't exist
+ */
public function getLocalId( $wikiId ) {
// Make sure the wiki ID is valid. (This prevents
DBConnectionError in unit tests)
$validWikis = self::getWikiList();
diff --git a/includes/specials/SpecialGlobalRenameRequest.php
b/includes/specials/SpecialGlobalRenameRequest.php
index e9c8349..c9c7cc6 100644
--- a/includes/specials/SpecialGlobalRenameRequest.php
+++ b/includes/specials/SpecialGlobalRenameRequest.php
@@ -101,8 +101,8 @@
}
/**
- * @param HTMLForm $form
- */
+ * @param HTMLForm $form
+ */
protected function alterForm( HTMLForm $form ) {
$form->setSubmitTextMsg( 'globalrenamerequest-submit-text' );
}
--
To view, visit https://gerrit.wikimedia.org/r/385565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id538f71c9343912e5372d8cfc2d3bdd3db37b584
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
