Thiemo Kreuz (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/402584 )
Change subject: Minor fixups to documentation, imports, and such ...................................................................... Minor fixups to documentation, imports, and such This patch contains a bunch of minor improvements that are not really worth their own patches. Please tell me if you disagree, and which changes I should split to seperate patches. Change-Id: Ib6a53a5b216498aa92085c46d5f13e45be04fb64 --- M includes/CentralAuthGroupMembershipProxy.php M includes/CentralAuthHooks.php M includes/CentralAuthPrimaryAuthenticationProvider.php M includes/LocalRenameJob/LocalRenameUserJob.php M includes/LocalRenameJob/LocalUserMergeJob.php M includes/session/CentralAuthTokenSessionProvider.php M includes/specials/SpecialGlobalRenameQueue.php M includes/specials/SpecialGlobalRenameRequest.php M tests/phpunit/CentralAuthTestUser.php 9 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/84/402584/1 diff --git a/includes/CentralAuthGroupMembershipProxy.php b/includes/CentralAuthGroupMembershipProxy.php index 7f1ea72..0dce775 100644 --- a/includes/CentralAuthGroupMembershipProxy.php +++ b/includes/CentralAuthGroupMembershipProxy.php @@ -96,7 +96,7 @@ /** * Replaces User::getGroupMemberships() - * @return array Associative array of (group name => UserGroupMembership object) + * @return UserGroupMembership[] Associative array of (group name => UserGroupMembership object) */ function getGroupMemberships() { $groups = $this->getGroups(); diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php index d56268b..b84cb05 100644 --- a/includes/CentralAuthHooks.php +++ b/includes/CentralAuthHooks.php @@ -1275,7 +1275,7 @@ /** * Check whether the user's preferences are such that a UI reload is * recommended. - * @param User $user User + * @param User $user * @return bool */ public static function isUIReloadRecommended( User $user ) { diff --git a/includes/CentralAuthPrimaryAuthenticationProvider.php b/includes/CentralAuthPrimaryAuthenticationProvider.php index 9540c29..1291faa 100644 --- a/includes/CentralAuthPrimaryAuthenticationProvider.php +++ b/includes/CentralAuthPrimaryAuthenticationProvider.php @@ -120,7 +120,7 @@ } $status = $this->checkPasswordValidity( $username, $req->password ); - if ( !$status->isOk() ) { + if ( !$status->isOK() ) { // Fatal, can't log in return AuthenticationResponse::newFail( $status->getMessage() ); } @@ -393,7 +393,7 @@ $options += [ 'flags' => User::READ_NORMAL ]; $status = parent::testUserForCreation( $user, $autocreate, $options ); - if ( !$status->isOk() ) { + if ( !$status->isOK() ) { return $status; } diff --git a/includes/LocalRenameJob/LocalRenameUserJob.php b/includes/LocalRenameJob/LocalRenameUserJob.php index 3a1cb8b..3a3b347 100644 --- a/includes/LocalRenameJob/LocalRenameUserJob.php +++ b/includes/LocalRenameJob/LocalRenameUserJob.php @@ -1,6 +1,6 @@ <?php -use \MediaWiki\MediaWikiServices; +use MediaWiki\MediaWikiServices; /** * Job class to rename a user locally diff --git a/includes/LocalRenameJob/LocalUserMergeJob.php b/includes/LocalRenameJob/LocalUserMergeJob.php index 0652a12..6ebeeeb 100644 --- a/includes/LocalRenameJob/LocalUserMergeJob.php +++ b/includes/LocalRenameJob/LocalUserMergeJob.php @@ -1,6 +1,6 @@ <?php -use \MediaWiki\MediaWikiServices; +use MediaWiki\MediaWikiServices; /** * Job class to merge a user locally diff --git a/includes/session/CentralAuthTokenSessionProvider.php b/includes/session/CentralAuthTokenSessionProvider.php index cbde2a2..9d43893 100644 --- a/includes/session/CentralAuthTokenSessionProvider.php +++ b/includes/session/CentralAuthTokenSessionProvider.php @@ -194,7 +194,7 @@ * Inject the "centralauthtoken" parameter into the API * @param ApiBase &$module API module * @param array &$params Array of parameter specifications - * @param int $flags Flags + * @param int $flags * @return bool */ public function onAPIGetAllowedParams( &$module, &$params, $flags ) { @@ -213,8 +213,8 @@ /** * Consume the centralauthtoken - * @param ApiBase $module API module - * @param User $user User + * @param ApiBase $module + * @param User $user * @param array &$message Error message key and params * @return bool */ diff --git a/includes/specials/SpecialGlobalRenameQueue.php b/includes/specials/SpecialGlobalRenameQueue.php index cf93c68..10eeea2 100644 --- a/includes/specials/SpecialGlobalRenameQueue.php +++ b/includes/specials/SpecialGlobalRenameQueue.php @@ -472,7 +472,7 @@ $out->addModules( 'ext.centralauth.globalrenamequeue' ); $status = $form->show(); - if ( $status instanceof Status && $status->isOk() ) { + if ( $status instanceof Status && $status->isOK() ) { $this->getOutput()->redirect( $this->getPageTitle( self::PAGE_PROCESS_REQUEST . "/{$req->getId()}/{$status->value}" diff --git a/includes/specials/SpecialGlobalRenameRequest.php b/includes/specials/SpecialGlobalRenameRequest.php index c9c7cc6..0e5ee35 100644 --- a/includes/specials/SpecialGlobalRenameRequest.php +++ b/includes/specials/SpecialGlobalRenameRequest.php @@ -207,7 +207,7 @@ protected function suggestedUsername() { do { $rand = $this->getUser()->getName() . rand( 123, 999 ); - } while ( !GlobalRenameRequest::isNameAvailable( $rand )->isOk() ); + } while ( !GlobalRenameRequest::isNameAvailable( $rand )->isOK() ); return $rand; } diff --git a/tests/phpunit/CentralAuthTestUser.php b/tests/phpunit/CentralAuthTestUser.php index bfcd948..c926d7b 100644 --- a/tests/phpunit/CentralAuthTestUser.php +++ b/tests/phpunit/CentralAuthTestUser.php @@ -77,7 +77,7 @@ private $createLocal; /** - * @param string $username the username + * @param string $username * @param string $password password for the account * @param array $attrs associative array of global user attributs * @param array $wikis array of arrays of wiki, attachement method -- To view, visit https://gerrit.wikimedia.org/r/402584 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6a53a5b216498aa92085c46d5f13e45be04fb64 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Thiemo Kreuz (WMDE) <thiemo.kr...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits