Thiemo Kreuz (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399166 )
Change subject: Enable Squiz.WhiteSpace.FunctionSpacing sniff and fix violations
......................................................................
Enable Squiz.WhiteSpace.FunctionSpacing sniff and fix violations
This patch does nothing but adding newlines for clarity (and removing
a few for the same reason).
Change-Id: Ia4890974282d898b5e86e904130f871a140c26c2
---
M .phpcs.xml
M AntiSpoof/CentralAuthAntiSpoofHooks.php
M AntiSpoof/CentralAuthSpoofUser.php
M AntiSpoof/batchCAAntiSpoof.php
M includes/CentralAuthGroupMembershipProxy.php
M includes/CentralAuthHooks.php
M includes/CentralAuthIdLookup.php
M includes/CentralAuthPrimaryAuthenticationProvider.php
M includes/CentralAuthReadOnlyError.php
M includes/CentralAuthSecondaryAuthenticationProvider.php
M includes/CentralAuthUnattachUserJob.php
M includes/CentralAuthUser.php
M includes/CentralAuthUserArray.php
M includes/CentralAuthUtils.php
M includes/CreateLocalAccountJob.php
M includes/EmailableUser.php
M includes/GlobalRename/GlobalRenameLogFormatter.php
M includes/GlobalRename/GlobalRenameUser.php
M includes/GlobalRename/GlobalRenameUserDatabaseUpdates.php
M includes/GlobalRename/GlobalRenameUserLogger.php
M includes/GlobalRename/GlobalRenameUserStatus.php
M includes/GlobalRename/GlobalRenameUserValidator.php
M includes/GlobalRename/GlobalUserMerge.php
M includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
M includes/GlobalRename/GlobalUserMergeLogFormatter.php
M includes/GlobalRename/GlobalUserMergeLogger.php
M includes/LocalRenameJob/LocalPageMoveJob.php
M includes/LocalRenameJob/LocalRenameJob.php
M includes/LocalRenameJob/LocalRenameUserJob.php
M includes/LocalRenameJob/LocalUserMergeJob.php
M includes/SuppressUserJob.php
M includes/UsersToRename/UsersToRenameDatabaseUpdates.php
M includes/WikiSet.php
M includes/api/ApiCentralAuthToken.php
M includes/api/ApiDeleteGlobalAccount.php
M includes/api/ApiGlobalUserRights.php
M includes/api/ApiQueryGlobalAllUsers.php
M includes/api/ApiQueryGlobalGroups.php
M includes/api/ApiQueryGlobalRenameStatus.php
M includes/api/ApiQueryGlobalUserInfo.php
M includes/api/ApiQueryWikiSets.php
M includes/api/ApiSetGlobalAccountStatus.php
M includes/session/CentralAuthSessionProvider.php
M includes/specials/SpecialCentralAuth.php
M includes/specials/SpecialCentralAutoLogin.php
M includes/specials/SpecialCentralLogin.php
M includes/specials/SpecialGlobalGroupMembership.php
M includes/specials/SpecialGlobalGroupPermissions.php
M includes/specials/SpecialGlobalRenameProgress.php
M includes/specials/SpecialGlobalRenameQueue.php
M includes/specials/SpecialGlobalRenameRequest.php
M includes/specials/SpecialGlobalRenameUser.php
M includes/specials/SpecialGlobalUserMerge.php
M includes/specials/SpecialGlobalUsers.php
M includes/specials/SpecialMergeAccount.php
M includes/specials/SpecialMultiLock.php
M includes/specials/SpecialSulRenameWarning.php
M includes/specials/SpecialUsersWhoWillBeRenamed.php
M includes/specials/SpecialWikiSets.php
M maintenance/attachAccount.php
M maintenance/checkLocalNames.php
M maintenance/checkLocalUser.php
M maintenance/createLocalAccount.php
M maintenance/deleteEmptyAccounts.php
M maintenance/fixStuckGlobalRename.php
M maintenance/forceRenameUsers.php
M maintenance/getCentralAuthDBInfo.php
M maintenance/migrateAccount.php
M maintenance/migratePass0.php
M maintenance/migratePass1.php
M maintenance/populateGlobalRenameLogSearch.php
M maintenance/populateHomeDB.php
M maintenance/populateListOfUsersToRename.php
M maintenance/populateLocalAndGlobalIds.php
M maintenance/resetGlobalUserTokens.php
M maintenance/sendConfirmAndMigrateEmail.php
M maintenance/sendForceRenameNotification.php
M maintenance/updateUsersToRename.php
M rcfeed/CARCFeedFormatter.php
M rcfeed/IRCColourfulCARCFeedFormatter.php
M rcfeed/JSONCARCFeedFormatter.php
M tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
M tests/phpunit/CentralAuthIdLookupTest.php
M tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
M tests/phpunit/CentralAuthSessionProviderTest.php
M tests/phpunit/CentralAuthTestCaseUsingDatabase.php
M tests/phpunit/CentralAuthTestUser.php
M tests/phpunit/CentralAuthUserUsingDatabaseTest.php
88 files changed, 188 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/66/399166/1
diff --git a/.phpcs.xml b/.phpcs.xml
index c69d3c8..cc60104 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -21,6 +21,11 @@
<property name="ignoreList" type="array"
value="migratePassZero,getEditCount,countEdits" />
</properties>
</rule>
+ <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+ <properties>
+ <property name="spacing" value="1" />
+ </properties>
+ </rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>
diff --git a/AntiSpoof/CentralAuthAntiSpoofHooks.php
b/AntiSpoof/CentralAuthAntiSpoofHooks.php
index bb7b01e..3e1443b 100644
--- a/AntiSpoof/CentralAuthAntiSpoofHooks.php
+++ b/AntiSpoof/CentralAuthAntiSpoofHooks.php
@@ -112,4 +112,5 @@
$spoof->update( $oldName );
return true;
}
+
}
diff --git a/AntiSpoof/CentralAuthSpoofUser.php
b/AntiSpoof/CentralAuthSpoofUser.php
index 51d0f96..4f1e0ef 100644
--- a/AntiSpoof/CentralAuthSpoofUser.php
+++ b/AntiSpoof/CentralAuthSpoofUser.php
@@ -3,6 +3,7 @@
use Wikimedia\Rdbms\IDatabase;
class CentralAuthSpoofUser extends SpoofUser {
+
/**
* @return IDatabase
*/
@@ -30,4 +31,5 @@
protected function getUserColumn() {
return 'gu_name';
}
+
}
diff --git a/AntiSpoof/batchCAAntiSpoof.php b/AntiSpoof/batchCAAntiSpoof.php
index 017ccbb..53aaadf 100644
--- a/AntiSpoof/batchCAAntiSpoof.php
+++ b/AntiSpoof/batchCAAntiSpoof.php
@@ -48,6 +48,7 @@
protected function makeSpoofUser( $name ) {
return new CentralAuthSpoofUser( $name );
}
+
}
$maintClass = "BatchCAAntiSpoof";
diff --git a/includes/CentralAuthGroupMembershipProxy.php
b/includes/CentralAuthGroupMembershipProxy.php
index 7f1ea72..521aeb3 100644
--- a/includes/CentralAuthGroupMembershipProxy.php
+++ b/includes/CentralAuthGroupMembershipProxy.php
@@ -1,9 +1,11 @@
<?php
+
/**
* Cut-down copy of User interface for local-interwiki-database
* user rights manipulation.
*/
class CentralAuthGroupMembershipProxy {
+
/**
* @var string
*/
@@ -146,4 +148,5 @@
function attachedOn( $wiki ) {
return $this->mGlobalUser->attachedOn( $wiki );
}
+
}
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index a24917e..19b92d4 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -443,6 +443,7 @@
}
$inject_html .= "</p></div>\n";
}
+
if ( $wgCentralAuthLoginWiki ) {
$wiki = WikiMap::getWiki( $wgCentralAuthLoginWiki );
// Use WikiReference::getFullUrl(), returns a
protocol-relative URL if needed
@@ -1147,6 +1148,7 @@
]
);
}
+
if ( $wgCentralAuthLoginWiki ) {
$wiki = WikiMap::getWiki( $wgCentralAuthLoginWiki );
// Use WikiReference::getFullUrl(), returns a
protocol-relative URL if needed
@@ -1182,14 +1184,17 @@
if ( $user->isAnon() ) {
return true;
}
+
$centralUser = CentralAuthUser::getInstance( $user );
if ( !( $centralUser->exists() && $centralUser->isAttached() )
) {
return true;
}
+
$wikiID = $centralUser->getHomeWiki();
if ( strval( $wikiID ) === '' ) {
return true;
}
+
$wiki = WikiMap::getWiki( $wikiID );
$wikiUrl = $wiki->getUrl( '' );
$parts = explode( '/', $wikiUrl );
@@ -1511,4 +1516,5 @@
$db->dropTable( $table );
}
}
+
}
diff --git a/includes/CentralAuthIdLookup.php b/includes/CentralAuthIdLookup.php
index 9af795b..47f6636 100644
--- a/includes/CentralAuthIdLookup.php
+++ b/includes/CentralAuthIdLookup.php
@@ -1,8 +1,10 @@
<?php
+
/**
* Look up central IDs using CentralAuth
*/
class CentralAuthIdLookup extends CentralIdLookup {
+
public function lookupCentralIds(
array $idToName, $audience = self::AUDIENCE_PUBLIC, $flags =
self::READ_NORMAL
) {
diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php
b/includes/CentralAuthPrimaryAuthenticationProvider.php
index 9d96793..32295f2 100644
--- a/includes/CentralAuthPrimaryAuthenticationProvider.php
+++ b/includes/CentralAuthPrimaryAuthenticationProvider.php
@@ -549,4 +549,5 @@
}
}
}
+
}
diff --git a/includes/CentralAuthReadOnlyError.php
b/includes/CentralAuthReadOnlyError.php
index 4411f02..f49c297 100644
--- a/includes/CentralAuthReadOnlyError.php
+++ b/includes/CentralAuthReadOnlyError.php
@@ -7,10 +7,12 @@
* @ingroup Exception
*/
class CentralAuthReadOnlyError extends ErrorPageError {
+
public function __construct() {
parent::__construct(
'centralauth-readonly',
'centralauth-readonlytext'
);
}
+
}
diff --git a/includes/CentralAuthSecondaryAuthenticationProvider.php
b/includes/CentralAuthSecondaryAuthenticationProvider.php
index 332b42c..b1058f8 100644
--- a/includes/CentralAuthSecondaryAuthenticationProvider.php
+++ b/includes/CentralAuthSecondaryAuthenticationProvider.php
@@ -76,4 +76,5 @@
public function beginSecondaryAccountCreation( $user, $creator, array
$reqs ) {
return AuthenticationResponse::newAbstain();
}
+
}
diff --git a/includes/CentralAuthUnattachUserJob.php
b/includes/CentralAuthUnattachUserJob.php
index abc22f3..ea1359c 100644
--- a/includes/CentralAuthUnattachUserJob.php
+++ b/includes/CentralAuthUnattachUserJob.php
@@ -56,4 +56,5 @@
}
return true;
}
+
}
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index c363eb6..02d0f7a 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -13,6 +13,7 @@
use MediaWiki\Logger\LoggerFactory;
class CentralAuthUser extends AuthPluginUser implements IDBAccessObject {
+
/** Cache of loaded CentralAuthUsers */
private static $loadedUsers = null;
@@ -2990,4 +2991,5 @@
private function clearLocalUserCache( $wikiId, $userId ) {
User::purge( $wikiId, $userId );
}
+
}
diff --git a/includes/CentralAuthUserArray.php
b/includes/CentralAuthUserArray.php
index 4b180f2..55ba306 100644
--- a/includes/CentralAuthUserArray.php
+++ b/includes/CentralAuthUserArray.php
@@ -9,9 +9,11 @@
static function newFromResult( $res ) {
return new CentralAuthUserArrayFromResult( $res );
}
+
}
class CentralAuthUserArrayFromResult extends UserArrayFromResult {
+
private $globalData;
/**
@@ -85,4 +87,5 @@
}
}
}
+
}
diff --git a/includes/CentralAuthUtils.php b/includes/CentralAuthUtils.php
index b4d8100..a93a67a 100644
--- a/includes/CentralAuthUtils.php
+++ b/includes/CentralAuthUtils.php
@@ -5,6 +5,7 @@
use MediaWiki\MediaWikiServices;
class CentralAuthUtils {
+
/** @var BagOStuff|null Session cache */
private static $sessionCache = null;
@@ -273,4 +274,5 @@
JobQueueGroup::singleton( $wiki )->lazyPush( $job );
}
}
+
}
diff --git a/includes/CreateLocalAccountJob.php
b/includes/CreateLocalAccountJob.php
index f4eecad..01266f8 100644
--- a/includes/CreateLocalAccountJob.php
+++ b/includes/CreateLocalAccountJob.php
@@ -9,6 +9,7 @@
* @see $wgCentralAuthAutoCreateWikis
*/
class CentralAuthCreateLocalAccountJob extends Job {
+
/**
* @param Title $title Not used
* @param array $params name => user name, from => wiki where the job
is created,
@@ -62,4 +63,5 @@
return true;
}
+
}
diff --git a/includes/EmailableUser.php b/includes/EmailableUser.php
index 3dca870..120b7ed 100644
--- a/includes/EmailableUser.php
+++ b/includes/EmailableUser.php
@@ -83,4 +83,5 @@
$wgLang->date( $expiration, false ),
$wgLang->time( $expiration, false ) )->text() );
}
+
}
diff --git a/includes/GlobalRename/GlobalRenameLogFormatter.php
b/includes/GlobalRename/GlobalRenameLogFormatter.php
index 992a252..2a1c6ee 100644
--- a/includes/GlobalRename/GlobalRenameLogFormatter.php
+++ b/includes/GlobalRename/GlobalRenameLogFormatter.php
@@ -6,6 +6,7 @@
* - gblrename/promote
*/
class GlobalRenameLogFormatter extends LogFormatter {
+
protected function getMessageParameters() {
parent::getMessageParameters();
$params = $this->extractParameters();
@@ -47,4 +48,5 @@
return Message::rawParam( WikiMap::foreignUserLink( $wiki,
$name, $text ) );
}
+
}
diff --git a/includes/GlobalRename/GlobalRenameUser.php
b/includes/GlobalRename/GlobalRenameUser.php
index dc842a6..3781f0f 100644
--- a/includes/GlobalRename/GlobalRenameUser.php
+++ b/includes/GlobalRename/GlobalRenameUser.php
@@ -6,8 +6,8 @@
* @license GNU GPL v2+
* @author Marius Hoch < [email protected] >
*/
-
class GlobalRenameUser {
+
/**
* @var User
*/
@@ -221,4 +221,5 @@
$title = Title::newFromText( 'Global rename job' ); // This
isn't used anywhere!
return new LocalRenameUserJob( $title, $params );
}
+
}
diff --git a/includes/GlobalRename/GlobalRenameUserDatabaseUpdates.php
b/includes/GlobalRename/GlobalRenameUserDatabaseUpdates.php
index e00576b..4860439 100644
--- a/includes/GlobalRename/GlobalRenameUserDatabaseUpdates.php
+++ b/includes/GlobalRename/GlobalRenameUserDatabaseUpdates.php
@@ -6,8 +6,8 @@
* @license GNU GPL v2+
* @author Marius Hoch < [email protected] >
*/
-
class GlobalRenameUserDatabaseUpdates {
+
/**
* @return IDatabase
*/
@@ -38,4 +38,5 @@
$dbw->endAtomic( __METHOD__ );
}
+
}
diff --git a/includes/GlobalRename/GlobalRenameUserLogger.php
b/includes/GlobalRename/GlobalRenameUserLogger.php
index c904161..79e75a5 100644
--- a/includes/GlobalRename/GlobalRenameUserLogger.php
+++ b/includes/GlobalRename/GlobalRenameUserLogger.php
@@ -6,8 +6,8 @@
* @license GNU GPL v2+
* @author Marius Hoch < [email protected] >
*/
-
class GlobalRenameUserLogger {
+
/**
* @var User
*/
@@ -79,4 +79,5 @@
$logid = $logEntry->insert();
$logEntry->publish( $logid );
}
+
}
diff --git a/includes/GlobalRename/GlobalRenameUserStatus.php
b/includes/GlobalRename/GlobalRenameUserStatus.php
index effc2a0..04238f2 100644
--- a/includes/GlobalRename/GlobalRenameUserStatus.php
+++ b/includes/GlobalRename/GlobalRenameUserStatus.php
@@ -259,4 +259,5 @@
return $ret;
}
+
}
diff --git a/includes/GlobalRename/GlobalRenameUserValidator.php
b/includes/GlobalRename/GlobalRenameUserValidator.php
index 1589051..304346f 100644
--- a/includes/GlobalRename/GlobalRenameUserValidator.php
+++ b/includes/GlobalRename/GlobalRenameUserValidator.php
@@ -6,8 +6,8 @@
* @license GNU GPL v2+
* @author Marius Hoch < [email protected] >
*/
-
class GlobalRenameUserValidator {
+
/**
* Check that we can perform the rename
*
@@ -45,4 +45,5 @@
return $status;
}
+
}
diff --git a/includes/GlobalRename/GlobalUserMerge.php
b/includes/GlobalRename/GlobalUserMerge.php
index 83b7f7e..d99a087 100644
--- a/includes/GlobalRename/GlobalUserMerge.php
+++ b/includes/GlobalRename/GlobalUserMerge.php
@@ -9,8 +9,8 @@
* @author Marius Hoch < [email protected] >
* @author Kunal Mehta < [email protected] >
*/
-
class GlobalUserMerge {
+
/**
* @var User
*/
@@ -203,4 +203,5 @@
]
);
}
+
}
diff --git a/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
b/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
index 41427fb..eff8ccd 100644
--- a/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
+++ b/includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php
@@ -6,8 +6,8 @@
* @license GNU GPL v2+
* @author Marius Hoch < [email protected] >
*/
-
class GlobalUserMergeDatabaseUpdates {
+
/**
* @return IDatabase
*/
@@ -124,4 +124,5 @@
);
$dbw->endAtomic( __METHOD__ );
}
+
}
diff --git a/includes/GlobalRename/GlobalUserMergeLogFormatter.php
b/includes/GlobalRename/GlobalUserMergeLogFormatter.php
index da38dab..3242e3f 100644
--- a/includes/GlobalRename/GlobalUserMergeLogFormatter.php
+++ b/includes/GlobalRename/GlobalUserMergeLogFormatter.php
@@ -4,6 +4,7 @@
* Format the gblrename/merge log entries
*/
class GlobalUserMergeLogFormatter extends LogFormatter {
+
protected function getMessageParameters() {
parent::getMessageParameters();
$params = $this->extractParameters();
@@ -35,4 +36,5 @@
);
}
}
+
}
diff --git a/includes/GlobalRename/GlobalUserMergeLogger.php
b/includes/GlobalRename/GlobalUserMergeLogger.php
index 5e63187..3e8ec93 100644
--- a/includes/GlobalRename/GlobalUserMergeLogger.php
+++ b/includes/GlobalRename/GlobalUserMergeLogger.php
@@ -6,8 +6,8 @@
* @license GNU GPL v2+
* @author Kunal Mehta
*/
-
class GlobalUserMergeLogger {
+
/**
* @var User
*/
@@ -47,4 +47,5 @@
$logid = $logEntry->insert();
$logEntry->publish( $logid );
}
+
}
diff --git a/includes/LocalRenameJob/LocalPageMoveJob.php
b/includes/LocalRenameJob/LocalPageMoveJob.php
index d290b46..935573c 100644
--- a/includes/LocalRenameJob/LocalPageMoveJob.php
+++ b/includes/LocalRenameJob/LocalPageMoveJob.php
@@ -16,6 +16,7 @@
* 'suppressredirects' - Whether redirects should be suppressed
*/
class LocalPageMoveJob extends Job {
+
/**
* @var User
*/
@@ -74,4 +75,5 @@
wfDebugLog( 'CentralAuthRename', "Page move failed:
{$oldPage} -> {$newPage}" );
}
}
+
}
diff --git a/includes/LocalRenameJob/LocalRenameJob.php
b/includes/LocalRenameJob/LocalRenameJob.php
index 317423b..27d4bfb 100644
--- a/includes/LocalRenameJob/LocalRenameJob.php
+++ b/includes/LocalRenameJob/LocalRenameJob.php
@@ -10,6 +10,7 @@
* indvidually.
*/
abstract class LocalRenameJob extends Job {
+
/**
* @var GlobalRenameUserStatus
*/
@@ -95,6 +96,7 @@
if ( !User::isUsableName( $user->getName() ) ) {
return $user;
}
+
$caUser = CentralAuthUser::getMasterInstance( $user );
// Race condition where the renamer isn't attached here, but
// someone creates an account in the meantime and then bad
@@ -153,4 +155,5 @@
JobQueueGroup::singleton( $nextWiki )->push( $job );
}
}
+
}
diff --git a/includes/LocalRenameJob/LocalRenameUserJob.php
b/includes/LocalRenameJob/LocalRenameUserJob.php
index 56c5a77..3f379aa 100644
--- a/includes/LocalRenameJob/LocalRenameUserJob.php
+++ b/includes/LocalRenameJob/LocalRenameUserJob.php
@@ -7,6 +7,7 @@
* This is intended to be run on each wiki individually
*/
class LocalRenameUserJob extends LocalRenameJob {
+
/**
* @param Title $title
* @param array $params An associative array of options:
@@ -185,4 +186,5 @@
$caOld = CentralAuthUser::getInstanceByName(
$this->params['from'] );
$caOld->quickInvalidateCache();
}
+
}
diff --git a/includes/LocalRenameJob/LocalUserMergeJob.php
b/includes/LocalRenameJob/LocalUserMergeJob.php
index 969487b..0516fbb 100644
--- a/includes/LocalRenameJob/LocalUserMergeJob.php
+++ b/includes/LocalRenameJob/LocalUserMergeJob.php
@@ -7,6 +7,7 @@
* This is intended to be run on each wiki individually
*/
class LocalUserMergeJob extends LocalRenameJob {
+
public function __construct( Title $title, array $params ) {
$this->command = 'LocalUserMergeJob';
diff --git a/includes/SuppressUserJob.php b/includes/SuppressUserJob.php
index d85a232..3aa45e7 100644
--- a/includes/SuppressUserJob.php
+++ b/includes/SuppressUserJob.php
@@ -6,6 +6,7 @@
* $wgCentralAuthWikisPerSuppressJob.
*/
class CentralAuthSuppressUserJob extends Job {
+
/**
* @param Title $title Associated title
* @param array $params Job parameters
@@ -42,4 +43,5 @@
}
return true;
}
+
}
diff --git a/includes/UsersToRename/UsersToRenameDatabaseUpdates.php
b/includes/UsersToRename/UsersToRenameDatabaseUpdates.php
index 844132c..e073ba1 100644
--- a/includes/UsersToRename/UsersToRenameDatabaseUpdates.php
+++ b/includes/UsersToRename/UsersToRenameDatabaseUpdates.php
@@ -97,4 +97,5 @@
return $rows; // @todo this shouldn't return prefixed field
names
}
+
}
diff --git a/includes/WikiSet.php b/includes/WikiSet.php
index dda1d30..5e12235 100644
--- a/includes/WikiSet.php
+++ b/includes/WikiSet.php
@@ -4,6 +4,7 @@
use Wikimedia\Rdbms\Database;
class WikiSet {
+
const OPTIN = 'optin';
const OPTOUT = 'optout';
const VERSION = 1;
@@ -364,4 +365,5 @@
// centralauth-rightslog-set-optin,
centralauth-rightslog-set-optout
return wfMessage( "centralauth-rightslog-set-{$type}"
)->escaped();
}
+
}
diff --git a/includes/api/ApiCentralAuthToken.php
b/includes/api/ApiCentralAuthToken.php
index 855d654..a92c11a 100644
--- a/includes/api/ApiCentralAuthToken.php
+++ b/includes/api/ApiCentralAuthToken.php
@@ -29,6 +29,7 @@
* @ingroup Extensions
*/
class ApiCentralAuthToken extends ApiBase {
+
public function __construct( ApiMain $main, $moduleName ) {
parent::__construct( $main, $moduleName );
}
@@ -107,4 +108,5 @@
=> 'apihelp-centralauthtoken-example-1',
];
}
+
}
diff --git a/includes/api/ApiDeleteGlobalAccount.php
b/includes/api/ApiDeleteGlobalAccount.php
index 2ab156e..cf75cdb 100644
--- a/includes/api/ApiDeleteGlobalAccount.php
+++ b/includes/api/ApiDeleteGlobalAccount.php
@@ -29,6 +29,7 @@
* @ingroup Extensions
*/
class ApiDeleteGlobalAccount extends ApiBase {
+
/* Heavily based on code from SpecialCentralAuth::doSubmit */
public function execute() {
if ( is_callable( [ $this, 'checkUserRightsAny' ] ) ) {
@@ -111,4 +112,5 @@
$list['deleteglobalaccount'] = [ __CLASS__, 'getToken' ];
return true; // Hooks must return bool
}
+
}
diff --git a/includes/api/ApiGlobalUserRights.php
b/includes/api/ApiGlobalUserRights.php
index 3e418d3..3294bb3 100644
--- a/includes/api/ApiGlobalUserRights.php
+++ b/includes/api/ApiGlobalUserRights.php
@@ -26,6 +26,7 @@
* @ingroup API
*/
class ApiGlobalUserRights extends ApiUserrights {
+
protected function getUserRightsPage() {
return new SpecialGlobalGroupMembership;
}
@@ -45,4 +46,5 @@
=> 'apihelp-globaluserrights-example-2',
];
}
+
}
diff --git a/includes/api/ApiQueryGlobalAllUsers.php
b/includes/api/ApiQueryGlobalAllUsers.php
index 38c4e3d..533ca2a 100644
--- a/includes/api/ApiQueryGlobalAllUsers.php
+++ b/includes/api/ApiQueryGlobalAllUsers.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Api module for CentralAuth extension to list all global users.
* Partly based on ApiQueryAllUsers.
@@ -25,6 +26,7 @@
* @author Marius Hoch < [email protected] >
*/
class ApiQueryGlobalAllUsers extends ApiQueryBase {
+
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'agu' );
}
@@ -277,4 +279,5 @@
=> 'apihelp-query+globalallusers-example-2',
];
}
+
}
diff --git a/includes/api/ApiQueryGlobalGroups.php
b/includes/api/ApiQueryGlobalGroups.php
index 5f9656a..f0618a3 100644
--- a/includes/api/ApiQueryGlobalGroups.php
+++ b/includes/api/ApiQueryGlobalGroups.php
@@ -29,6 +29,7 @@
* @ingroup Extensions
*/
class ApiQueryGlobalGroups extends ApiQueryBase {
+
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'ggp' );
}
@@ -111,4 +112,5 @@
=> 'apihelp-query+globalgroups-example-2',
];
}
+
}
diff --git a/includes/api/ApiQueryGlobalRenameStatus.php
b/includes/api/ApiQueryGlobalRenameStatus.php
index 5ae7900..03ae370 100644
--- a/includes/api/ApiQueryGlobalRenameStatus.php
+++ b/includes/api/ApiQueryGlobalRenameStatus.php
@@ -22,6 +22,7 @@
* API module equivalent of Special:GlobalRenameStatus
*/
class ApiQueryGlobalRenameStatus extends ApiQueryBase {
+
public function __construct( ApiQuery $queryModule, $moduleName ) {
parent::__construct( $queryModule, $moduleName, 'grs' );
}
@@ -84,4 +85,5 @@
=> 'apihelp-query+globalrenamestatus-example-1',
];
}
+
}
diff --git a/includes/api/ApiQueryGlobalUserInfo.php
b/includes/api/ApiQueryGlobalUserInfo.php
index 35194eb..1bedeba 100644
--- a/includes/api/ApiQueryGlobalUserInfo.php
+++ b/includes/api/ApiQueryGlobalUserInfo.php
@@ -29,6 +29,7 @@
* @ingroup Extensions
*/
class ApiQueryGlobalUserInfo extends ApiQueryBase {
+
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'gui' );
}
@@ -202,4 +203,5 @@
=> 'apihelp-query+globaluserinfo-example-2',
];
}
+
}
diff --git a/includes/api/ApiQueryWikiSets.php
b/includes/api/ApiQueryWikiSets.php
index d2f2742..235de50 100644
--- a/includes/api/ApiQueryWikiSets.php
+++ b/includes/api/ApiQueryWikiSets.php
@@ -29,6 +29,7 @@
* @ingroup Extensions
*/
class ApiQueryWikiSets extends ApiQueryBase {
+
public function __construct( $query, $moduleName ) {
parent::__construct( $query, $moduleName, 'ws' );
}
@@ -119,4 +120,5 @@
=> 'apihelp-query+wikisets-example-2',
];
}
+
}
diff --git a/includes/api/ApiSetGlobalAccountStatus.php
b/includes/api/ApiSetGlobalAccountStatus.php
index 1570a45..e9c1116 100644
--- a/includes/api/ApiSetGlobalAccountStatus.php
+++ b/includes/api/ApiSetGlobalAccountStatus.php
@@ -29,6 +29,7 @@
* @ingroup Extensions
*/
class ApiSetGlobalAccountStatus extends ApiBase {
+
/* Heavily based on code from SpecialCentralAuth::doSubmit */
public function execute() {
$params = $this->extractRequestParams();
@@ -167,4 +168,5 @@
$list['setglobalaccountstatus'] = [ __CLASS__, 'getToken' ];
return true; // Hooks must return bool
}
+
}
diff --git a/includes/session/CentralAuthSessionProvider.php
b/includes/session/CentralAuthSessionProvider.php
index 39614c0..4e2585a 100644
--- a/includes/session/CentralAuthSessionProvider.php
+++ b/includes/session/CentralAuthSessionProvider.php
@@ -517,4 +517,5 @@
$this->getLoginCookieExpiration( 'UserID', /*
$shouldRememberUser */ true )
) ?: null;
}
+
}
diff --git a/includes/specials/SpecialCentralAuth.php
b/includes/specials/SpecialCentralAuth.php
index 48b6150..7c829e4 100644
--- a/includes/specials/SpecialCentralAuth.php
+++ b/includes/specials/SpecialCentralAuth.php
@@ -1,6 +1,7 @@
<?php
class SpecialCentralAuth extends SpecialPage {
+
private $mUserName, $mCanUnmerge, $mCanLock, $mCanOversight, $mCanEdit;
/**
@@ -788,6 +789,7 @@
'1',
'mw-centralauth-status-locked-yes',
$this->mGlobalUser->isLocked() );
+
$radioHidden =
Xml::radioLabel(
$this->msg(
'centralauth-admin-status-hidden-no' )->parse(),
@@ -912,4 +914,5 @@
protected function getGroupName() {
return 'users';
}
+
}
diff --git a/includes/specials/SpecialCentralAutoLogin.php
b/includes/specials/SpecialCentralAutoLogin.php
index 6b93784..14a2166 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -8,6 +8,7 @@
* @ingroup Extensions
*/
class SpecialCentralAutoLogin extends UnlistedSpecialPage {
+
private $loginWiki;
/** @var MediaWiki\\Session\\Session|null */
@@ -710,4 +711,5 @@
return $centralSession;
}
+
}
diff --git a/includes/specials/SpecialCentralLogin.php
b/includes/specials/SpecialCentralLogin.php
index c2aedda..4e59197 100644
--- a/includes/specials/SpecialCentralLogin.php
+++ b/includes/specials/SpecialCentralLogin.php
@@ -343,4 +343,5 @@
$this->getOutput()->wrapWikiMsg( '<div class="error">$1</div>',
$args );
$this->getOutput()->addHtml( '<p
id="centralauth-backlink-section"></p>' ); // JS only
}
+
}
diff --git a/includes/specials/SpecialGlobalGroupMembership.php
b/includes/specials/SpecialGlobalGroupMembership.php
index 6d707a2..7f27c8f 100644
--- a/includes/specials/SpecialGlobalGroupMembership.php
+++ b/includes/specials/SpecialGlobalGroupMembership.php
@@ -1,11 +1,12 @@
<?php
+
/**
* Equivalent of Special:Userrights for global groups.
*
* @ingroup Extensions
*/
-
class SpecialGlobalGroupMembership extends UserrightsPage {
+
/**
* @var CentralAuthUser
*/
@@ -152,4 +153,5 @@
]
);
}
+
}
diff --git a/includes/specials/SpecialGlobalGroupPermissions.php
b/includes/specials/SpecialGlobalGroupPermissions.php
index e24c368..9dbf36b 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -17,8 +17,8 @@
* @file
* @ingroup Extensions
*/
-
class SpecialGlobalGroupPermissions extends SpecialPage {
+
public function __construct() {
parent::__construct( 'GlobalGroupPermissions' );
}
@@ -707,4 +707,5 @@
protected function getGroupName() {
return 'users';
}
+
}
diff --git a/includes/specials/SpecialGlobalRenameProgress.php
b/includes/specials/SpecialGlobalRenameProgress.php
index 132c2fd..e9b7048 100644
--- a/includes/specials/SpecialGlobalRenameProgress.php
+++ b/includes/specials/SpecialGlobalRenameProgress.php
@@ -3,6 +3,7 @@
use MediaWiki\Logger\LoggerFactory;
class SpecialGlobalRenameProgress extends FormSpecialPage {
+
/**
* @var GlobalRenameUserStatus
*/
@@ -154,4 +155,5 @@
public function requiresUnblock() {
return false;
}
+
}
diff --git a/includes/specials/SpecialGlobalRenameQueue.php
b/includes/specials/SpecialGlobalRenameQueue.php
index bf05d5a..96ae083 100644
--- a/includes/specials/SpecialGlobalRenameQueue.php
+++ b/includes/specials/SpecialGlobalRenameQueue.php
@@ -680,6 +680,7 @@
self::PAGE_CLOSED_QUEUE
];
}
+
}
/**
@@ -920,4 +921,5 @@
}
return $this->mFieldNames;
}
+
}
diff --git a/includes/specials/SpecialGlobalRenameRequest.php
b/includes/specials/SpecialGlobalRenameRequest.php
index c9c7cc6..5b89604 100644
--- a/includes/specials/SpecialGlobalRenameRequest.php
+++ b/includes/specials/SpecialGlobalRenameRequest.php
@@ -291,4 +291,5 @@
protected function getGroupName() {
return 'login';
}
+
}
diff --git a/includes/specials/SpecialGlobalRenameUser.php
b/includes/specials/SpecialGlobalRenameUser.php
index 4df7ae6..459635a 100644
--- a/includes/specials/SpecialGlobalRenameUser.php
+++ b/includes/specials/SpecialGlobalRenameUser.php
@@ -285,4 +285,5 @@
protected function getGroupName() {
return 'users';
}
+
}
diff --git a/includes/specials/SpecialGlobalUserMerge.php
b/includes/specials/SpecialGlobalUserMerge.php
index 86d8ed9..9a0ef0a 100644
--- a/includes/specials/SpecialGlobalUserMerge.php
+++ b/includes/specials/SpecialGlobalUserMerge.php
@@ -216,4 +216,5 @@
protected function getGroupName() {
return 'users';
}
+
}
diff --git a/includes/specials/SpecialGlobalUsers.php
b/includes/specials/SpecialGlobalUsers.php
index 6385072..1304b9c 100644
--- a/includes/specials/SpecialGlobalUsers.php
+++ b/includes/specials/SpecialGlobalUsers.php
@@ -1,6 +1,7 @@
<?php
class SpecialGlobalUsers extends SpecialPage {
+
public function __construct() {
parent::__construct( 'GlobalUsers' );
}
@@ -45,9 +46,11 @@
protected function getGroupName() {
return 'users';
}
+
}
class GlobalUsersPager extends AlphabeticPager {
+
protected $requestedGroup = false;
protected $requestedUser = false;
protected $globalIDGroups = [];
@@ -282,4 +285,5 @@
}
return $result;
}
+
}
diff --git a/includes/specials/SpecialMergeAccount.php
b/includes/specials/SpecialMergeAccount.php
index ff0151d..87d5249 100644
--- a/includes/specials/SpecialMergeAccount.php
+++ b/includes/specials/SpecialMergeAccount.php
@@ -1,6 +1,7 @@
<?php
class SpecialMergeAccount extends SpecialPage {
+
protected $mUserName;
protected $mAttemptMerge;
protected $mMergeAction;
@@ -671,4 +672,5 @@
protected function getGroupName() {
return 'login';
}
+
}
diff --git a/includes/specials/SpecialMultiLock.php
b/includes/specials/SpecialMultiLock.php
index 29007ba..4e13fe9 100644
--- a/includes/specials/SpecialMultiLock.php
+++ b/includes/specials/SpecialMultiLock.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Special page to allow locking and hiding multiple users
* at one time. Lots of code derived from Special:CentralAuth.
@@ -6,8 +7,8 @@
* @file
* @ingroup Extensions
*/
-
class SpecialMultiLock extends SpecialPage {
+
private $mCanOversight;
private $mGlobalUsers, $mUserNames, $mPrefixSearch, $mPosted, $mMethod;
private $mActionLock, $mActionHide, $mReason, $mActionUserNames;
@@ -164,6 +165,7 @@
'lock',
'centralauth-admin-action-lock-lock',
false );
+
$radioHidden =
Xml::radioLabel(
$this->msg(
'centralauth-admin-action-hide-nochange' )->text(),
@@ -345,6 +347,7 @@
$guEditCount = $this->getLanguage()->formatNum(
$globalUser->getGlobalEditCount() );
$guAttachedLocalAccounts = $this->getLanguage()
->formatNum( count( $globalUser->listAttached() ) );
+
$rowHtml .= Html::rawElement( 'td', [],
Html::input(
'wpActionTarget['.$guName.']',
@@ -498,4 +501,5 @@
protected function getGroupName() {
return 'users';
}
+
}
diff --git a/includes/specials/SpecialSulRenameWarning.php
b/includes/specials/SpecialSulRenameWarning.php
index aa87c64..e08ad79 100644
--- a/includes/specials/SpecialSulRenameWarning.php
+++ b/includes/specials/SpecialSulRenameWarning.php
@@ -76,4 +76,5 @@
$request->setSessionData( 'SulRenameWarning', null );
}
}
+
}
diff --git a/includes/specials/SpecialUsersWhoWillBeRenamed.php
b/includes/specials/SpecialUsersWhoWillBeRenamed.php
index d7d54c4..8ff6663 100644
--- a/includes/specials/SpecialUsersWhoWillBeRenamed.php
+++ b/includes/specials/SpecialUsersWhoWillBeRenamed.php
@@ -1,6 +1,7 @@
<?php
class SpecialUsersWhoWillBeRenamed extends SpecialPage {
+
public function __construct() {
parent::__construct( 'UsersWhoWillBeRenamed' );
}
@@ -11,6 +12,7 @@
$this->getOutput()->addWikiMsg( 'centralauth-uwbr-intro' );
$this->getOutput()->addParserOutput( $pager->getFullOutput() );
}
+
}
/**
@@ -173,4 +175,5 @@
}
return $this->mFieldNames;
}
+
}
diff --git a/includes/specials/SpecialWikiSets.php
b/includes/specials/SpecialWikiSets.php
index d8aaeea..0398697 100644
--- a/includes/specials/SpecialWikiSets.php
+++ b/includes/specials/SpecialWikiSets.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Special page to allow to edit "wikisets" which are used to restrict
* specific global group permissions to certain wikis.
@@ -6,8 +7,8 @@
* @file
* @ingroup Extensions
*/
-
class SpecialWikiSets extends SpecialPage {
+
private $mCanEdit;
public function __construct() {
@@ -255,10 +256,12 @@
if ( !is_array( $list ) ) {
return '';
}
+
$count = count( $list );
if ( $count === 0 ) {
return $this->msg( 'centralauth-editset-nowikis'
)->parse();
}
+
# If there are less items than columns, limit the number of
columns
$columns = $count < $columns ? $count : $columns;
$itemsPerCol = ceil( $count / $columns );
@@ -268,6 +271,7 @@
$splitLists[$i] = array_slice( $list, $itemsPerCol *
$i, $itemsPerCol );
$i++;
}
+
$body = '';
foreach ( $splitLists as $splitList ) {
$body .= '<td width="' . round( 100 / $columns ) .
'%"><ul>';
@@ -346,6 +350,7 @@
$name, $type, $wikis, $reason );
return;
}
+
$badwikis = [];
$allwikis = CentralAuthUser::getWikiList();
foreach ( $wikis as $wiki ) {
@@ -446,4 +451,5 @@
protected function getGroupName() {
return 'wiki';
}
+
}
diff --git a/maintenance/attachAccount.php b/maintenance/attachAccount.php
index 3289fdb..6223cb1 100644
--- a/maintenance/attachAccount.php
+++ b/maintenance/attachAccount.php
@@ -29,6 +29,7 @@
* @copyright © 2016 Wikimedia Foundation and contributors.
*/
class AttachAccount extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -176,6 +177,7 @@
$this->missing, $this->reportPcnt( $this->missing )
) );
}
+
}
$maintClass = "AttachAccount";
diff --git a/maintenance/checkLocalNames.php b/maintenance/checkLocalNames.php
index 6c7a739..9d3d98c 100644
--- a/maintenance/checkLocalNames.php
+++ b/maintenance/checkLocalNames.php
@@ -7,6 +7,7 @@
require_once "$IP/maintenance/Maintenance.php";
class CheckLocalNames extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
diff --git a/maintenance/checkLocalUser.php b/maintenance/checkLocalUser.php
index fe5ea92..048fb67 100644
--- a/maintenance/checkLocalUser.php
+++ b/maintenance/checkLocalUser.php
@@ -7,6 +7,7 @@
require_once "$IP/maintenance/Maintenance.php";
class CheckLocalUser extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -198,6 +199,7 @@
$lastUsername = $u->lu_name;
} while ( $result->numRows() > 0 );
}
+
}
$maintClass = "CheckLocalUser";
diff --git a/maintenance/createLocalAccount.php
b/maintenance/createLocalAccount.php
index 7b82344..95e5eb8 100644
--- a/maintenance/createLocalAccount.php
+++ b/maintenance/createLocalAccount.php
@@ -7,6 +7,7 @@
require_once "$IP/maintenance/Maintenance.php";
class CreateLocalAccount extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -47,6 +48,7 @@
$this->output( "User '$username' created\n" );
}
}
+
}
$maintClass = 'CreateLocalAccount';
diff --git a/maintenance/deleteEmptyAccounts.php
b/maintenance/deleteEmptyAccounts.php
index d1db1cf..d01b2d9 100644
--- a/maintenance/deleteEmptyAccounts.php
+++ b/maintenance/deleteEmptyAccounts.php
@@ -7,6 +7,7 @@
require_once "$IP/maintenance/Maintenance.php";
class DeleteEmptyAccounts extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -134,6 +135,7 @@
}
}
}
+
}
$maintClass = "DeleteEmptyAccounts";
diff --git a/maintenance/fixStuckGlobalRename.php
b/maintenance/fixStuckGlobalRename.php
index 45ccb78..84f9902 100644
--- a/maintenance/fixStuckGlobalRename.php
+++ b/maintenance/fixStuckGlobalRename.php
@@ -11,6 +11,7 @@
* but failed for whatever reason
*/
class FixStuckGlobalRename extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -71,6 +72,7 @@
$renamer = 'Global rename script';
$comment = '';
}
+
$params = [
'from' => $oldName,
'to' => $newName,
@@ -98,6 +100,7 @@
$job->teardown( $status );
$this->output( $status ? "Done!\n" : "Failed!\n" );
}
+
}
$maintClass = 'FixStuckGlobalRename';
diff --git a/maintenance/forceRenameUsers.php b/maintenance/forceRenameUsers.php
index c9c9805..1f9ece4 100644
--- a/maintenance/forceRenameUsers.php
+++ b/maintenance/forceRenameUsers.php
@@ -164,6 +164,7 @@
return $rowsToRename;
}
+
}
$maintClass = 'ForceRenameUsers';
diff --git a/maintenance/getCentralAuthDBInfo.php
b/maintenance/getCentralAuthDBInfo.php
index 54b7ee7..1d2f55d 100644
--- a/maintenance/getCentralAuthDBInfo.php
+++ b/maintenance/getCentralAuthDBInfo.php
@@ -7,6 +7,7 @@
require_once "$IP/maintenance/Maintenance.php";
class GetCentralAuthDBInfo extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -18,6 +19,7 @@
$host = $db->getServer();
$this->output( "$host\n" );
}
+
}
$maintClass = 'GetCentralAuthDBInfo';
diff --git a/maintenance/migrateAccount.php b/maintenance/migrateAccount.php
index 4f265ca..877b342 100644
--- a/maintenance/migrateAccount.php
+++ b/maintenance/migrateAccount.php
@@ -7,6 +7,7 @@
require_once "$IP/maintenance/Maintenance.php";
class MigrateAccount extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -86,6 +87,7 @@
$this->output( "ERROR - Could not open file:
$list" );
exit( 1 );
}
+
// @codingStandardsIgnoreStart
while ( strlen( $line = trim( fgets( $file ) ) ) ) {
// @codingStandardsIgnoreEnd
@@ -259,6 +261,7 @@
$this->total > 0 ? ( $this->partial / $this->total *
100.0 ) : 0
) );
}
+
}
$maintClass = "MigrateAccount";
diff --git a/maintenance/migratePass0.php b/maintenance/migratePass0.php
index d17e396..4b5f077 100644
--- a/maintenance/migratePass0.php
+++ b/maintenance/migratePass0.php
@@ -67,6 +67,7 @@
}
}
}
+
}
$maintClass = 'MigratePassZero';
diff --git a/maintenance/migratePass1.php b/maintenance/migratePass1.php
index bb05795..f87b4c7 100644
--- a/maintenance/migratePass1.php
+++ b/maintenance/migratePass1.php
@@ -11,6 +11,7 @@
require_once "$IP/maintenance/Maintenance.php";
class MigratePass1 extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -57,6 +58,7 @@
$this->fromPrefix
) );
}
+
}
$maintClass = "MigratePass1";
diff --git a/maintenance/populateGlobalRenameLogSearch.php
b/maintenance/populateGlobalRenameLogSearch.php
index b345ffc..51e5e94 100644
--- a/maintenance/populateGlobalRenameLogSearch.php
+++ b/maintenance/populateGlobalRenameLogSearch.php
@@ -10,6 +10,7 @@
* Script to back-populate log_search for global rename entries
*/
class PopulateGlobalRenameLogSearch extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -57,6 +58,7 @@
$dbw->insert( 'log_search', $rows, __METHOD__, 'IGNORE' );
wfWaitForSlaves();
}
+
}
$maintClass = 'PopulateGlobalRenameLogSearch';
diff --git a/maintenance/populateHomeDB.php b/maintenance/populateHomeDB.php
index 7ebfe3b..db5e6bd 100644
--- a/maintenance/populateHomeDB.php
+++ b/maintenance/populateHomeDB.php
@@ -7,6 +7,7 @@
require_once "$IP/maintenance/Maintenance.php";
class PopulateHomeDB extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -45,6 +46,7 @@
} while ( true );
$this->output( "done.\n" );
}
+
}
$maintClass = 'PopulateHomeDB';
diff --git a/maintenance/populateListOfUsersToRename.php
b/maintenance/populateListOfUsersToRename.php
index adf78ba..c03f7ae 100644
--- a/maintenance/populateListOfUsersToRename.php
+++ b/maintenance/populateListOfUsersToRename.php
@@ -122,6 +122,7 @@
} while ( $count !== 0 );
}
+
}
$maintClass = 'PopulateListOfUsersToRename';
diff --git a/maintenance/populateLocalAndGlobalIds.php
b/maintenance/populateLocalAndGlobalIds.php
index 62b378f..7079218 100644
--- a/maintenance/populateLocalAndGlobalIds.php
+++ b/maintenance/populateLocalAndGlobalIds.php
@@ -1,4 +1,5 @@
<?php
+
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
$IP = __DIR__ . '/../../..';
diff --git a/maintenance/resetGlobalUserTokens.php
b/maintenance/resetGlobalUserTokens.php
index 90fc90e..51bbc1d 100644
--- a/maintenance/resetGlobalUserTokens.php
+++ b/maintenance/resetGlobalUserTokens.php
@@ -37,6 +37,7 @@
* @ingroup Maintenance
*/
class ResetGlobalUserTokens extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -108,6 +109,7 @@
$user->resetAuthToken();
$this->output( " OK\n" );
}
+
}
$maintClass = "ResetGlobalUserTokens";
diff --git a/maintenance/sendConfirmAndMigrateEmail.php
b/maintenance/sendConfirmAndMigrateEmail.php
index 67a7fbb..6f1e95a 100644
--- a/maintenance/sendConfirmAndMigrateEmail.php
+++ b/maintenance/sendConfirmAndMigrateEmail.php
@@ -180,6 +180,7 @@
$this->total > 0 ? ( $this->sent / $this->total * 100.0
) : 0
) );
}
+
}
$maintClass = "SendConfirmAndMigrateEmail";
diff --git a/maintenance/sendForceRenameNotification.php
b/maintenance/sendForceRenameNotification.php
index a33c9df..d998ec4 100644
--- a/maintenance/sendForceRenameNotification.php
+++ b/maintenance/sendForceRenameNotification.php
@@ -17,6 +17,7 @@
* A file for "en" must exist as it is the base fallback.
*/
class ForceRenameNotification extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -118,6 +119,7 @@
$this->error( "Could not find a valid localized file for
$langCode.", 1 );
}
+
}
$maintClass = 'ForceRenameNotification';
diff --git a/maintenance/updateUsersToRename.php
b/maintenance/updateUsersToRename.php
index 1b37f99..896a5a5 100644
--- a/maintenance/updateUsersToRename.php
+++ b/maintenance/updateUsersToRename.php
@@ -11,6 +11,7 @@
* table
*/
class UpdateUsersToRename extends Maintenance {
+
public function __construct() {
parent::__construct();
$this->requireExtension( 'CentralAuth' );
@@ -49,6 +50,7 @@
} while ( $rows->numRows() >= $this->mBatchSize );
$this->output( "Removed $total users in total.\n" );
}
+
}
$maintClass = 'UpdateUsersToRename';
diff --git a/rcfeed/CARCFeedFormatter.php b/rcfeed/CARCFeedFormatter.php
index a53645c..26f0c86 100644
--- a/rcfeed/CARCFeedFormatter.php
+++ b/rcfeed/CARCFeedFormatter.php
@@ -23,6 +23,7 @@
* Interface for CentralAuth RC feed formatters
*/
interface CARCFeedFormatter {
+
/**
* Generate an IRC line corresponding to user unification/creation
* @param Title $userpage
@@ -30,4 +31,5 @@
* @return string
*/
public function getLine( $userpage, $wikiID );
+
}
diff --git a/rcfeed/IRCColourfulCARCFeedFormatter.php
b/rcfeed/IRCColourfulCARCFeedFormatter.php
index d1a7935..bff054a 100644
--- a/rcfeed/IRCColourfulCARCFeedFormatter.php
+++ b/rcfeed/IRCColourfulCARCFeedFormatter.php
@@ -23,6 +23,7 @@
* Generates a colourful notification intended for humans on IRC.
*/
class IRCColourfulCARCFeedFormatter implements CARCFeedFormatter {
+
/**
* Generate an IRC line corresponding to user unification/creation
* @param Title $userpage
@@ -39,4 +40,5 @@
return "\00314[[\00307$title\00314]]\0034@$wikiID\00310 " .
"\00302$url\003 \0035*\003 \00303$user\003 \0035*\003\n";
}
+
}
diff --git a/rcfeed/JSONCARCFeedFormatter.php b/rcfeed/JSONCARCFeedFormatter.php
index b3c5a3b..cc722ce 100644
--- a/rcfeed/JSONCARCFeedFormatter.php
+++ b/rcfeed/JSONCARCFeedFormatter.php
@@ -18,8 +18,8 @@
*
* @file
*/
-
class JSONCARCFeedFormatter implements CARCFeedFormatter {
+
/**
* Generates a user unification/creation entry that can be easily
interpreted by a machine.
* @param Title $userpage
@@ -35,4 +35,5 @@
];
return FormatJson::encode( $packet );
}
+
}
diff --git a/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
b/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
index 5d8f9bd..a7049e3 100644
--- a/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
+++ b/tests/phpunit/CentralAuthHooksUsingDatabaseTest.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Basic tests for CentralAuthHooks
* @group CentralAuthDB
diff --git a/tests/phpunit/CentralAuthIdLookupTest.php
b/tests/phpunit/CentralAuthIdLookupTest.php
index fb573b2..06f4511 100644
--- a/tests/phpunit/CentralAuthIdLookupTest.php
+++ b/tests/phpunit/CentralAuthIdLookupTest.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Setup database tests for centralauth
* @group CentralAuthDB
diff --git a/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
b/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
index e8fbc29..efc2bca 100644
--- a/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
+++ b/tests/phpunit/CentralAuthPluginUsingDatabaseTest.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Basic tests for CentralAuthPlugin
* @group CentralAuthDB
@@ -321,4 +322,5 @@
}
return $wikiId;
}
+
}
diff --git a/tests/phpunit/CentralAuthSessionProviderTest.php
b/tests/phpunit/CentralAuthSessionProviderTest.php
index 13648c4..ea3b6ec 100644
--- a/tests/phpunit/CentralAuthSessionProviderTest.php
+++ b/tests/phpunit/CentralAuthSessionProviderTest.php
@@ -1,6 +1,7 @@
<?php
class CentralAuthSessionProviderTest extends PHPUnit_Framework_TestCase {
+
/**
* @dataProvider provideSuggestLoginUsername
*/
@@ -47,4 +48,5 @@
$this->assertSame( 200, $provider->getRememberUserDuration() );
}
+
}
diff --git a/tests/phpunit/CentralAuthTestCaseUsingDatabase.php
b/tests/phpunit/CentralAuthTestCaseUsingDatabase.php
index af356c2..e875057 100644
--- a/tests/phpunit/CentralAuthTestCaseUsingDatabase.php
+++ b/tests/phpunit/CentralAuthTestCaseUsingDatabase.php
@@ -6,8 +6,10 @@
* @group Database
*/
abstract class CentralAuthTestCaseUsingDatabase extends MediaWikiTestCase {
+
public function __construct( $name = null, array $data = [], $dataName
= '' ) {
$this->tablesUsed = array_merge( $this->tablesUsed,
CentralAuthHooks::$centralauthTables );
parent::__construct( $name, $data, $dataName );
}
+
}
diff --git a/tests/phpunit/CentralAuthTestUser.php
b/tests/phpunit/CentralAuthTestUser.php
index bfcd948..6db1270 100644
--- a/tests/phpunit/CentralAuthTestUser.php
+++ b/tests/phpunit/CentralAuthTestUser.php
@@ -1,8 +1,8 @@
<?php
+
/**
* Setup test global users
*/
-
class CentralAuthTestUser {
/**
@@ -19,46 +19,57 @@
* @var string gu_id
*/
private $guId;
+
/**
* @var string gu_password
*/
private $passHash;
+
/**
* @var string gu_salt
*/
private $salt;
+
/**
* @var string gu_auth_token
*/
private $authToken;
+
/**
* @var int gu_locked
*/
private $locked;
+
/**
* @var string gu_hidden
*/
private $hidden;
+
/**
* @var string gu_registration
*/
private $registration;
+
/**
* @var string gu_email
*/
private $email;
+
/**
* @var string gu_email_authenticated
*/
private $emailAuthenticated;
+
/**
* @var string gu_home_db
*/
private $homeDb;
+
/**
* @var string gu_enabled
*/
private $enabled;
+
/**
* @var string gu_enabled_method
*/
diff --git a/tests/phpunit/CentralAuthUserUsingDatabaseTest.php
b/tests/phpunit/CentralAuthUserUsingDatabaseTest.php
index d264f9c..1a1e835 100644
--- a/tests/phpunit/CentralAuthUserUsingDatabaseTest.php
+++ b/tests/phpunit/CentralAuthUserUsingDatabaseTest.php
@@ -1,9 +1,9 @@
<?php
+
/**
* Setup database tests for centralauth
* @group CentralAuthDB
*/
-
class CentralAuthUserUsingDatabaseTest extends
CentralAuthTestCaseUsingDatabase {
/**
--
To view, visit https://gerrit.wikimedia.org/r/399166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4890974282d898b5e86e904130f871a140c26c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
