jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371312 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
Change-Id: Ice399f9eeffa2260636be9c683de2fbe9d603313
---
M composer.json
M includes/GoogleUser.php
M includes/specials/SpecialManageGoogleLogin.php
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index efd81f3..8079d4f 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.1",
+ "mediawiki/mediawiki-codesniffer": "0.11.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/GoogleUser.php b/includes/GoogleUser.php
index 1bc13b5..73083bf 100644
--- a/includes/GoogleUser.php
+++ b/includes/GoogleUser.php
@@ -128,7 +128,7 @@
* User Id set to this object.
*
* @param User $user The user to get the Google Id for
- * @param integer $flags User::READ_* constant bitfield
+ * @param int $flags User::READ_* constant bitfield
* @return null|array An array of user IDs, null if an error occurred
or no IDs was found
*/
public static function getGoogleIdFromUser( User $user, $flags =
User::READ_LATEST ) {
@@ -162,7 +162,7 @@
* User Id set to this object.
*
* @param string $googleId The Google ID to get the user to
- * @param integer $flags User::READ_* constant bitfield
+ * @param int $flags User::READ_* constant bitfield
* @return null|User The local User account connected with the Google
ID if
* the Google ID is connected to an User, null otherwise.
*/
diff --git a/includes/specials/SpecialManageGoogleLogin.php
b/includes/specials/SpecialManageGoogleLogin.php
index 667573a..efa7b1c 100644
--- a/includes/specials/SpecialManageGoogleLogin.php
+++ b/includes/specials/SpecialManageGoogleLogin.php
@@ -130,7 +130,7 @@
}
$formFields = [];
if ( $googleIds ) {
- $formFields['googleids'] = [
+ $formFields['googleids'] = [
'type' => 'checkmatrix',
'columns' => [
$this->msg(
'googlelogin-manage-terminatebutton' )->escaped() => 'google'
@@ -155,7 +155,7 @@
* Submithandler for new google id
*
* @param array $data Formdata
- * @param boolean $checkSession If true, checks, if the form was
submitted by the user itself
+ * @param bool $checkSession If true, checks, if the form was submitted
by the user itself
* @return bool
*/
public function submitForm( array $data, $checkSession = true ) {
--
To view, visit https://gerrit.wikimedia.org/r/371312
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice399f9eeffa2260636be9c683de2fbe9d603313
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GoogleLogin
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.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
