jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331832 )
Change subject: Fix phpcs mistakes
......................................................................
Fix phpcs mistakes
Fixes some broken indentation introduced in I51182c5e1.
Change-Id: I9efb75fe74ed732e3634b7061a64766bc4d539f2
---
M backend/MWOAuthConsumerAcceptance.php
M control/MWOAuthConsumerSubmitControl.php
M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
M frontend/specialpages/SpecialMWOAuthListConsumers.php
M frontend/specialpages/SpecialMWOAuthManageMyGrants.php
5 files changed, 18 insertions(+), 13 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
Anomie: Looks good to me, but someone else must approve
diff --git a/backend/MWOAuthConsumerAcceptance.php
b/backend/MWOAuthConsumerAcceptance.php
index 474f992..97c9824 100644
--- a/backend/MWOAuthConsumerAcceptance.php
+++ b/backend/MWOAuthConsumerAcceptance.php
@@ -146,7 +146,7 @@
return $row;
}
- protected function decodeRow( \DBConnRef $db, $row ) {;
+ protected function decodeRow( \DBConnRef $db, $row ) {
$row['oaac_grants'] = \FormatJson::decode( $row['oaac_grants'],
true );
$row['oaac_accepted'] = wfTimestamp( TS_MW,
$row['oaac_accepted'] );
diff --git a/control/MWOAuthConsumerSubmitControl.php
b/control/MWOAuthConsumerSubmitControl.php
index 9265a5b..13d7e9a 100644
--- a/control/MWOAuthConsumerSubmitControl.php
+++ b/control/MWOAuthConsumerSubmitControl.php
@@ -77,14 +77,14 @@
'description' => '/^.*$/s',
'email' => function( $s ) {
return \Sanitizer::validateEmail( $s );
- },
+ },
'wiki' => function( $s ) {
global $wgConf;
return ( $s === '*'
|| in_array( $s,
$wgConf->getLocalDatabases() )
|| array_search( $s,
MWOAuthUtils::getAllWikiNames() ) !== false
);
- },
+ },
'granttype' =>
'/^(authonly|authonlyprivate|normal)$/',
'grants' => function( $s ) {
$grants = \FormatJson::decode( $s, true
);
@@ -114,8 +114,9 @@
}
},
'rsaKey' => $validateRsaKey,
- 'resetSecret' => function( $s ) { return
is_bool( $s );
- },
+ 'resetSecret' => function( $s ) {
+ return is_bool( $s );
+ },
'reason' => '/^.{0,255}$/',
'changeToken' => '/^[0-9a-f]{40}$/'
],
diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
index ad96093..fee0f59 100644
--- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
+++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php
@@ -172,8 +172,9 @@
)
),
'force-options-on' => array_map(
- function( $g ) { return
"grant-$g";
- },
+ function( $g ) {
+ return
"grant-$g";
+ },
\MWGrants::getHiddenGrants()
),
'validation-callback' => null
// different format
diff --git a/frontend/specialpages/SpecialMWOAuthListConsumers.php
b/frontend/specialpages/SpecialMWOAuthListConsumers.php
index 2fd5196..836b813 100644
--- a/frontend/specialpages/SpecialMWOAuthListConsumers.php
+++ b/frontend/specialpages/SpecialMWOAuthListConsumers.php
@@ -180,8 +180,9 @@
$this->getContext()
);
$form->setAction( $this->getPageTitle()->getFullUrl() ); //
always go back to listings
- $form->setSubmitCallback( function() { return false;
- } );
+ $form->setSubmitCallback( function() {
+ return false;
+ } );
$form->setMethod( 'get' );
$form->setSubmitTextMsg( 'go' );
$form->setWrapperLegendMsg( 'mwoauthlistconsumers-legend' );
diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
index 2bbde9a..5f7b0f6 100644
--- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
+++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php
@@ -178,8 +178,9 @@
$cmr->get( 'grants' )
),
'default' => array_map(
- function( $g ) { return
"grant-$g";
- },
+ function( $g ) {
+ return "grant-$g";
+ },
$cmra->get( 'grants' )
),
'tooltips' => [
@@ -188,8 +189,9 @@
\MWGrants::getGrantsLink(
'mwoauth-authonlyprivate' ) => $this->msg(
'mwoauthmanagemygrants-authonly-tooltip' )->text(),
],
'force-options-on' => array_map(
- function( $g ) { return
"grant-$g";
- },
+ function( $g ) {
+ return "grant-$g";
+ },
( $type === 'revoke' )
? array_merge(
\MWGrants::getValidGrants(), self::irrevocableGrants() )
:
self::irrevocableGrants()
--
To view, visit https://gerrit.wikimedia.org/r/331832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9efb75fe74ed732e3634b7061a64766bc4d539f2
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/OAuth
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[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
