From 0cb2a09b6d0c7318e49d5ef7c5989e9005a625ff Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 4 Sep 2017 11:05:26 -0700 Subject: [PATCH] Always put type information before variable name for @var tags Like other tags, @var should have the type information before the variable name. Change-Id: I9eca6957b1990fa8cc687103dc02ee38af5f9086 --- includes/actions/CreditsAction.php | 2 +- includes/actions/InfoAction.php | 2 +- includes/api/ApiEditPage.php | 4 ++-- includes/api/ApiQuery.php | 6 +++--- includes/api/ApiQueryBacklinks.php | 2 +- includes/api/ApiQueryCategoryInfo.php | 2 +- includes/api/ApiQueryDuplicateFiles.php | 4 ++-- includes/api/ApiQueryImageInfo.php | 4 ++-- includes/api/ApiQueryInfo.php | 6 +++--- includes/api/ApiQueryQueryPage.php | 4 ++-- includes/api/ApiQueryRevisions.php | 2 +- includes/api/ApiSetNotificationTimestamp.php | 2 +- includes/api/ApiUpload.php | 6 +++--- includes/changes/EnhancedChangesList.php | 4 ++-- includes/deferred/DeferredUpdates.php | 2 +- includes/filerepo/file/File.php | 2 +- includes/filerepo/file/LocalFile.php | 4 ++-- includes/installer/MssqlInstaller.php | 2 +- includes/installer/MysqlInstaller.php | 2 +- includes/installer/PostgresInstaller.php | 2 +- includes/libs/filebackend/SwiftFileBackend.php | 2 +- includes/libs/rdbms/ChronologyProtector.php | 2 +- includes/libs/rdbms/database/DatabaseMysqli.php | 2 +- .../rdbms/database/resultwrapper/FakeResultWrapper.php | 2 +- includes/libs/rdbms/loadbalancer/LoadBalancer.php | 6 +++--- includes/libs/stats/SamplingStatsdClient.php | 2 +- includes/media/TransformationalImageHandler.php | 2 +- includes/page/WikiPage.php | 2 +- includes/rcfeed/FormattedRCFeed.php | 2 +- includes/revisiondelete/RevDelArchivedFileItem.php | 4 ++-- includes/revisiondelete/RevDelList.php | 8 ++++---- includes/specialpage/AuthManagerSpecialPage.php | 2 +- includes/specials/pagers/BlockListPager.php | 2 +- includes/specials/pagers/ProtectedPagesPager.php | 2 +- 34 files changed, 52 insertions(+), 52 deletions(-) diff --git a/includes/actions/CreditsAction.php b/includes/actions/CreditsAction.php index 021f426ee3..7025477803 100644 --- a/includes/actions/CreditsAction.php +++ b/includes/actions/CreditsAction.php @@ -131,7 +131,7 @@ class CreditsAction extends FormlessAction { $anon_ips = []; # Sift for real versus user names - /** @var $user User */ + /** @var User $user */ foreach ( $contributors as $user ) { $cnt--; if ( $user->isLoggedIn() ) { diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index 68dda37b6d..d3ba0aa49c 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -848,7 +848,7 @@ class InfoAction extends FormlessAction { $linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer(); # Sift for real versus user names - /** @var $user User */ + /** @var User $user */ foreach ( $contributors as $user ) { $page = $user->isAnon() ? SpecialPage::getTitleFor( 'Contributions', $user->getName() ) diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index 2245195cb0..4360b4d782 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -62,7 +62,7 @@ class ApiEditPage extends ApiBase { $redirValues = []; - /** @var $newTitle Title */ + /** @var Title $newTitle */ foreach ( $titles as $id => $newTitle ) { if ( !isset( $titles[$id - 1] ) ) { $titles[$id - 1] = $oldTitle; @@ -359,7 +359,7 @@ class ApiEditPage extends ApiBase { $articleContext->setWikiPage( $pageObj ); $articleContext->setUser( $this->getUser() ); - /** @var $articleObject Article */ + /** @var Article $articleObject */ $articleObject = Article::newFromWikiPage( $pageObj, $articleContext ); $ep = new EditPage( $articleObject ); diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php index e6f3fc45f7..987bb99289 100644 --- a/includes/api/ApiQuery.php +++ b/includes/api/ApiQuery.php @@ -245,7 +245,7 @@ class ApiQuery extends ApiBase { $cacheMode = $this->mPageSet->getCacheMode(); // Execute all unfinished modules - /** @var $module ApiQueryBase */ + /** @var ApiQueryBase $module */ foreach ( $modules as $module ) { $params = $module->extractRequestParams(); $cacheMode = $this->mergeCacheMode( @@ -381,7 +381,7 @@ class ApiQuery extends ApiBase { ]; } // Report special pages - /** @var $title Title */ + /** @var Title $title */ foreach ( $pageSet->getSpecialTitles() as $fakeId => $title ) { $vals = []; ApiQueryBase::addTitleInfo( $vals, $title ); @@ -434,7 +434,7 @@ class ApiQuery extends ApiBase { $titles = $pageSet->getGoodTitles(); if ( count( $titles ) ) { $user = $this->getUser(); - /** @var $title Title */ + /** @var Title $title */ foreach ( $titles as $title ) { if ( $title->userCan( 'read', $user ) ) { $exportTitles[] = $title; diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php index 56cbaac3c1..54be254d59 100644 --- a/includes/api/ApiQueryBacklinks.php +++ b/includes/api/ApiQueryBacklinks.php @@ -228,7 +228,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase { $titleWhere = []; $allRedirNs = []; $allRedirDBkey = []; - /** @var $t Title */ + /** @var Title $t */ foreach ( $this->redirTitles as $t ) { $redirNs = $t->getNamespace(); $redirDBkey = $t->getDBkey(); diff --git a/includes/api/ApiQueryCategoryInfo.php b/includes/api/ApiQueryCategoryInfo.php index 2a3bf38718..25e9b27499 100644 --- a/includes/api/ApiQueryCategoryInfo.php +++ b/includes/api/ApiQueryCategoryInfo.php @@ -47,7 +47,7 @@ class ApiQueryCategoryInfo extends ApiQueryBase { $titles = $this->getPageSet()->getGoodAndMissingTitles(); $cattitles = []; foreach ( $categories as $c ) { - /** @var $t Title */ + /** @var Title $t */ $t = $titles[$c]; $cattitles[$c] = $t->getDBkey(); } diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php index 2ebd6de7d6..0eaeaece73 100644 --- a/includes/api/ApiQueryDuplicateFiles.php +++ b/includes/api/ApiQueryDuplicateFiles.php @@ -91,7 +91,7 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase { $sha1s = []; foreach ( $files as $file ) { - /** @var $file File */ + /** @var File $file */ $sha1s[$file->getName()] = $file->getSha1(); } @@ -114,7 +114,7 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase { if ( $params['dir'] == 'descending' ) { $dupFiles = array_reverse( $dupFiles ); } - /** @var $dupFile File */ + /** @var File $dupFile */ foreach ( $dupFiles as $dupFile ) { $dupName = $dupFile->getName(); if ( $image == $dupName && $dupFile->isLocal() ) { diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php index 7b0080eb23..b1df982da7 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -124,7 +124,7 @@ class ApiQueryImageInfo extends ApiQueryBase { } } - /** @var $img File */ + /** @var File $img */ $img = $images[$title]; if ( self::getTransformCount() >= self::TRANSFORM_LIMIT ) { @@ -199,7 +199,7 @@ class ApiQueryImageInfo extends ApiQueryBase { // Get one more to facilitate query-continue functionality $count = ( $gotOne ? 1 : 0 ); $oldies = $img->getHistory( $params['limit'] - $count + 1, $start, $params['end'] ); - /** @var $oldie File */ + /** @var File $oldie */ foreach ( $oldies as $oldie ) { if ( ++$count > $params['limit'] ) { // We've reached the extra one which shows that there are diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php index ecdebd4dd9..bff19780f6 100644 --- a/includes/api/ApiQueryInfo.php +++ b/includes/api/ApiQueryInfo.php @@ -372,7 +372,7 @@ class ApiQueryInfo extends ApiQueryBase { $this->getDisplayTitle(); } - /** @var $title Title */ + /** @var Title $title */ foreach ( $this->everything as $pageid => $title ) { $pageInfo = $this->extractPageInfo( $pageid, $title ); $fit = $pageInfo !== null && $result->addValue( [ @@ -548,7 +548,7 @@ class ApiQueryInfo extends ApiQueryBase { $res = $this->select( __METHOD__ ); foreach ( $res as $row ) { - /** @var $title Title */ + /** @var Title $title */ $title = $this->titles[$row->pr_page]; $a = [ 'type' => $row->pr_type, @@ -688,7 +688,7 @@ class ApiQueryInfo extends ApiQueryBase { private function getTSIDs() { $getTitles = $this->talkids = $this->subjectids = []; - /** @var $t Title */ + /** @var Title $t */ foreach ( $this->everything as $t ) { if ( MWNamespace::isTalk( $t->getNamespace() ) ) { if ( $this->fld_subjectid ) { diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php index caa5f05743..46c2265501 100644 --- a/includes/api/ApiQueryQueryPage.php +++ b/includes/api/ApiQueryQueryPage.php @@ -59,7 +59,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { $params = $this->extractRequestParams(); $result = $this->getResult(); - /** @var $qp QueryPage */ + /** @var QueryPage $qp */ $qp = new $this->qpMap[$params['page']](); if ( !$qp->userCanExecute( $this->getUser() ) ) { $this->dieWithError( 'apierror-specialpage-cantexecute' ); @@ -129,7 +129,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { } public function getCacheMode( $params ) { - /** @var $qp QueryPage */ + /** @var QueryPage $qp */ $qp = new $this->qpMap[$params['page']](); if ( $qp->getRestriction() != '' ) { return 'private'; diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php index a4f0315e9f..2dfa42a3a4 100644 --- a/includes/api/ApiQueryRevisions.php +++ b/includes/api/ApiQueryRevisions.php @@ -166,7 +166,7 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase { // For each page we will request, the user must have read rights for that page $user = $this->getUser(); $status = Status::newGood(); - /** @var $title Title */ + /** @var Title $title */ foreach ( $pageSet->getGoodTitles() as $title ) { if ( !$title->userCan( 'read', $user ) ) { $status->fatal( ApiMessage::create( diff --git a/includes/api/ApiSetNotificationTimestamp.php b/includes/api/ApiSetNotificationTimestamp.php index 663416e69e..b6a0a7838e 100644 --- a/includes/api/ApiSetNotificationTimestamp.php +++ b/includes/api/ApiSetNotificationTimestamp.php @@ -150,7 +150,7 @@ class ApiSetNotificationTimestamp extends ApiBase { ); // Now, put the valid titles into the result - /** @var $title Title */ + /** @var Title $title */ foreach ( $pageSet->getTitles() as $title ) { $ns = $title->getNamespace(); $dbkey = $title->getDBkey(); diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index a283b5a215..cfe1968938 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -71,7 +71,7 @@ class ApiUpload extends ApiBase { $this->checkPermissions( $user ); // Fetch the file (usually a no-op) - /** @var $status Status */ + /** @var Status $status */ $status = $this->mUpload->fetchFile(); if ( !$status->isGood() ) { $this->dieStatus( $status ); @@ -772,7 +772,7 @@ class ApiUpload extends ApiBase { $this->mParams['text'] = $this->mParams['comment']; } - /** @var $file LocalFile */ + /** @var LocalFile $file */ $file = $this->mUpload->getLocalFile(); // For preferences mode, we want to watch if 'watchdefault' is set, @@ -829,7 +829,7 @@ class ApiUpload extends ApiBase { $result['result'] = 'Poll'; $result['stage'] = 'queued'; } else { - /** @var $status Status */ + /** @var Status $status */ $status = $this->mUpload->performUpload( $this->mParams['comment'], $this->mParams['text'], $watch, $this->getUser(), $this->mParams['tags'] ); diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php index 21a811ee8a..8e24efe77b 100644 --- a/includes/changes/EnhancedChangesList.php +++ b/includes/changes/EnhancedChangesList.php @@ -515,7 +515,7 @@ class EnhancedChangesList extends ChangesList { $sinceLast = 0; $unvisitedOldid = null; - /** @var $rcObj RCCacheEntry */ + /** @var RCCacheEntry $rcObj */ foreach ( $block as $rcObj ) { // Same logic as below inside main foreach if ( $rcObj->watched && $rcObj->mAttribs['rc_timestamp'] >= $rcObj->watched ) { @@ -537,7 +537,7 @@ class EnhancedChangesList extends ChangesList { # Total change link $links = []; - /** @var $block0 RecentChange */ + /** @var RecentChange $block0 */ $block0 = $block[0]; $last = $block[count( $block ) - 1]; if ( !$allLogs ) { diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php index 40069f33c0..e8e250b551 100644 --- a/includes/deferred/DeferredUpdates.php +++ b/includes/deferred/DeferredUpdates.php @@ -149,7 +149,7 @@ class DeferredUpdates { if ( $update instanceof MergeableUpdate ) { $class = get_class( $update ); // fully-qualified class if ( isset( $queue[$class] ) ) { - /** @var $existingUpdate MergeableUpdate */ + /** @var MergeableUpdate $existingUpdate */ $existingUpdate = $queue[$class]; $existingUpdate->merge( $update ); } else { diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index 4ea097369f..32f4504ba6 100644 --- a/includes/filerepo/file/File.php +++ b/includes/filerepo/file/File.php @@ -1147,7 +1147,7 @@ abstract class File implements IDBAccessObject { if ( !$thumb ) { // bad params? $thumb = false; } elseif ( $thumb->isError() ) { // transform error - /** @var $thumb MediaTransformError */ + /** @var MediaTransformError $thumb */ $this->lastError = $thumb->toText(); // Ignore errors if requested if ( $wgIgnoreImageErrors && !( $flags & self::RENDER_NOW ) ) { diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 904c932d58..9af0c6d89d 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -1556,7 +1556,7 @@ class LocalFile extends File { ); if ( isset( $status->value['revision'] ) ) { - /** @var $rev Revision */ + /** @var Revision $rev */ $rev = $status->value['revision']; // Associate new page revision id $logEntry->setAssociatedRevId( $rev->getId() ); @@ -1564,7 +1564,7 @@ class LocalFile extends File { // This relies on the resetArticleID() call in WikiPage::insertOn(), // which is triggered on $descTitle by doEditContent() above. if ( isset( $status->value['revision'] ) ) { - /** @var $rev Revision */ + /** @var Revision $rev */ $rev = $status->value['revision']; $updateLogPage = $rev->getPage(); } diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php index 43d3574152..d01f954632 100644 --- a/includes/installer/MssqlInstaller.php +++ b/includes/installer/MssqlInstaller.php @@ -266,7 +266,7 @@ class MssqlInstaller extends DatabaseInstaller { if ( !$status->isOK() ) { return false; } - /** @var $conn Database */ + /** @var Database $conn */ $conn = $status->value; // We need the server-level ALTER ANY LOGIN permission to create new accounts diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index 0250b6f9c3..dc638998e5 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -275,7 +275,7 @@ class MysqlInstaller extends DatabaseInstaller { if ( !$status->isOK() ) { return false; } - /** @var $conn Database */ + /** @var Database $conn */ $conn = $status->value; // Get current account name diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index b501cb37fa..1a3fb104f6 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -594,7 +594,7 @@ class PostgresInstaller extends DatabaseInstaller { return $status; } - /** @var $conn DatabasePostgres */ + /** @var DatabasePostgres $conn */ $conn = $status->value; if ( $conn->tableExists( 'archive' ) ) { diff --git a/includes/libs/filebackend/SwiftFileBackend.php b/includes/libs/filebackend/SwiftFileBackend.php index eb72edc2ed..de5a103831 100644 --- a/includes/libs/filebackend/SwiftFileBackend.php +++ b/includes/libs/filebackend/SwiftFileBackend.php @@ -1250,7 +1250,7 @@ class SwiftFileBackend extends FileBackendStore { * @return StatusValue[] */ protected function doExecuteOpHandlesInternal( array $fileOpHandles ) { - /** @var $statuses StatusValue[] */ + /** @var StatusValue[] $statuses */ $statuses = []; $auth = $this->getAuthentication(); diff --git a/includes/libs/rdbms/ChronologyProtector.php b/includes/libs/rdbms/ChronologyProtector.php index f002d3eacc..8121654e33 100644 --- a/includes/libs/rdbms/ChronologyProtector.php +++ b/includes/libs/rdbms/ChronologyProtector.php @@ -315,7 +315,7 @@ class ChronologyProtector implements LoggerAwareInterface { * @return array */ private static function mergePositions( $curValue, array $shutdownPositions ) { - /** @var $curPositions DBMasterPos[] */ + /** @var DBMasterPos[] $curPositions */ if ( $curValue === false ) { $curPositions = $shutdownPositions; } else { diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php index b925e2c653..4c3cbddf76 100644 --- a/includes/libs/rdbms/database/DatabaseMysqli.php +++ b/includes/libs/rdbms/database/DatabaseMysqli.php @@ -34,7 +34,7 @@ use IP; * @see Database */ class DatabaseMysqli extends DatabaseMysqlBase { - /** @var $mConn mysqli */ + /** @var mysqli $mConn */ /** * @param string $sql diff --git a/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php b/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php index 493cde8d9c..12e59b598f 100644 --- a/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php +++ b/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php @@ -9,7 +9,7 @@ use stdClass; * doesn't go anywhere near an actual database. */ class FakeResultWrapper extends ResultWrapper { - /** @var $result stdClass[] */ + /** @var stdClass[] $result */ /** * @param stdClass[] $rows diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php index 36de39e0fb..8393e2bcfe 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php @@ -384,9 +384,9 @@ class LoadBalancer implements ILoadBalancer { throw new InvalidArgumentException( "Empty server array given to LoadBalancer" ); } - /** @var $i int|bool Index of selected server */ + /** @var int|bool $i Index of selected server */ $i = false; - /** @var $laggedReplicaMode bool Whether server is considered lagged */ + /** @var bool $laggedReplicaMode Whether server is considered lagged */ $laggedReplicaMode = false; // Quickly look through the available servers for a server that meets criteria... @@ -538,7 +538,7 @@ class LoadBalancer implements ILoadBalancer { public function getAnyOpenConnection( $i ) { foreach ( $this->mConns as $connsByServer ) { if ( !empty( $connsByServer[$i] ) ) { - /** @var $serverConns IDatabase[] */ + /** @var IDatabase[] $serverConns */ $serverConns = $connsByServer[$i]; return reset( $serverConns ); diff --git a/includes/libs/stats/SamplingStatsdClient.php b/includes/libs/stats/SamplingStatsdClient.php index 1da9468d80..6494c26302 100644 --- a/includes/libs/stats/SamplingStatsdClient.php +++ b/includes/libs/stats/SamplingStatsdClient.php @@ -56,7 +56,7 @@ class SamplingStatsdClient extends StatsdClient { } if ( $samplingRates ) { array_walk( $data, function ( $item ) use ( $samplingRates ) { - /** @var $item StatsdData */ + /** @var StatsdData $item */ foreach ( $samplingRates as $pattern => $rate ) { if ( fnmatch( $pattern, $item->getKey(), FNM_NOESCAPE ) ) { $item->setSampleRate( $item->getSampleRate() * $rate ); diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php index 32208cca70..de438da2cf 100644 --- a/includes/media/TransformationalImageHandler.php +++ b/includes/media/TransformationalImageHandler.php @@ -221,7 +221,7 @@ abstract class TransformationalImageHandler extends ImageHandler { } # Try a hook. Called "Bitmap" for historical reasons. - /** @var $mto MediaTransformOutput */ + /** @var MediaTransformOutput $mto */ $mto = null; Hooks::run( 'BitmapHandlerTransform', [ $this, $image, &$scalerParams, &$mto ] ); if ( !is_null( $mto ) ) { diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 5a0670ca8f..21c298e7e7 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -1657,7 +1657,7 @@ class WikiPage implements Page, IDBAccessObject { // Convenience variables $now = wfTimestampNow(); $oldid = $meta['oldId']; - /** @var $oldContent Content|null */ + /** @var Content|null $oldContent */ $oldContent = $meta['oldContent']; $newsize = $content->getSize(); diff --git a/includes/rcfeed/FormattedRCFeed.php b/includes/rcfeed/FormattedRCFeed.php index 48a9f946a5..afe900d09c 100644 --- a/includes/rcfeed/FormattedRCFeed.php +++ b/includes/rcfeed/FormattedRCFeed.php @@ -52,7 +52,7 @@ abstract class FormattedRCFeed extends RCFeed { */ public function notify( RecentChange $rc, $actionComment = null ) { $params = $this->params; - /** @var $formatter RCFeedFormatter */ + /** @var RCFeedFormatter $formatter */ $formatter = is_object( $params['formatter'] ) ? $params['formatter'] : new $params['formatter']; $line = $formatter->getLine( $params, $rc, $actionComment ); diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php b/includes/revisiondelete/RevDelArchivedFileItem.php index 32d48918d2..b098422425 100644 --- a/includes/revisiondelete/RevDelArchivedFileItem.php +++ b/includes/revisiondelete/RevDelArchivedFileItem.php @@ -23,8 +23,8 @@ * Item class for a filearchive table row */ class RevDelArchivedFileItem extends RevDelFileItem { - /** @var $list RevDelArchivedFileList */ - /** @var $file ArchivedFile */ + /** @var RevDelArchivedFileList $list */ + /** @var ArchivedFile $file */ /** @var LocalFile */ protected $lockFile; diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php index a2c58e6741..011c7b09db 100644 --- a/includes/revisiondelete/RevDelList.php +++ b/includes/revisiondelete/RevDelList.php @@ -83,7 +83,7 @@ abstract class RevDelList extends RevisionListBase { public function areAnySuppressed() { $bit = $this->getSuppressBit(); - /** @var $item RevDelItem */ + /** @var RevDelItem $item */ foreach ( $this as $item ) { if ( $item->getBits() & $bit ) { return true; @@ -151,7 +151,7 @@ abstract class RevDelList extends RevisionListBase { // passed to doPostCommitUpdates(). $visibilityChangeMap = []; - /** @var $item RevDelItem */ + /** @var RevDelItem $item */ foreach ( $this as $item ) { unset( $missing[$item->getId()] ); @@ -294,7 +294,7 @@ abstract class RevDelList extends RevisionListBase { final protected function acquireItemLocks() { $status = Status::newGood(); - /** @var $item RevDelItem */ + /** @var RevDelItem $item */ foreach ( $this as $item ) { $status->merge( $item->lock() ); } @@ -304,7 +304,7 @@ abstract class RevDelList extends RevisionListBase { final protected function releaseItemLocks() { $status = Status::newGood(); - /** @var $item RevDelItem */ + /** @var RevDelItem $item */ foreach ( $this as $item ) { $status->merge( $item->unlock() ); } diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php index 500c2e93f5..0cdc55f060 100644 --- a/includes/specialpage/AuthManagerSpecialPage.php +++ b/includes/specialpage/AuthManagerSpecialPage.php @@ -688,7 +688,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage { if ( isset( $singleFieldInfo['options'] ) ) { $descriptor['options'] = array_flip( array_map( function ( $message ) { - /** @var $message Message */ + /** @var Message $message */ return $message->parse(); }, $singleFieldInfo['options'] ) ); } diff --git a/includes/specials/pagers/BlockListPager.php b/includes/specials/pagers/BlockListPager.php index 2206be8f01..924fd06cf0 100644 --- a/includes/specials/pagers/BlockListPager.php +++ b/includes/specials/pagers/BlockListPager.php @@ -79,7 +79,7 @@ class BlockListPager extends TablePager { } } - /** @var $row object */ + /** @var object $row */ $row = $this->mCurrentRow; $language = $this->getLanguage(); diff --git a/includes/specials/pagers/ProtectedPagesPager.php b/includes/specials/pagers/ProtectedPagesPager.php index 20b44d2150..1587abc0c7 100644 --- a/includes/specials/pagers/ProtectedPagesPager.php +++ b/includes/specials/pagers/ProtectedPagesPager.php @@ -120,7 +120,7 @@ class ProtectedPagesPager extends TablePager { * @throws MWException */ function formatValue( $field, $value ) { - /** @var $row object */ + /** @var object $row */ $row = $this->mCurrentRow; switch ( $field ) { -- 2.20.1