Merge "Remove some more comments that literally repeat the code"

42 files changed, 66 insertions, 66 deletions

diff --git a/includes/CategoriesRdf.php b/includes/CategoriesRdf.php
index dfe51d452537..278a312a81cb 100644
--- a/includes/CategoriesRdf.php
+++ b/includes/CategoriesRdf.php
@@ -79,7 +79,7 @@ class CategoriesRdf {
 
 	/**
 	 * Write out the data for single category.
-	 * @param string $categoryName Category name
+	 * @param string $categoryName
 	 * @param bool $isHidden Hidden category?
 	 * @param int $pages Page count (note this includes only Wiki articles, not subcats or files)
 	 * @param int $subcategories Subcategory count
diff --git a/includes/Hook/ArticleMergeCompleteHook.php b/includes/Hook/ArticleMergeCompleteHook.php
index f6cc2aaf0174..1b1b96582aea 100644
--- a/includes/Hook/ArticleMergeCompleteHook.php
+++ b/includes/Hook/ArticleMergeCompleteHook.php
@@ -17,7 +17,7 @@ interface ArticleMergeCompleteHook {
 	 *
 	 * @since 1.35
 	 *
-	 * @param Title $targetTitle Target title
+	 * @param Title $targetTitle
 	 * @param Title $destTitle Destination title
 	 * @return bool|void True or no return value to continue or false to abort
 	 */
diff --git a/includes/Html.php b/includes/Html.php
index 8b19456debfc..749b4b6f981c 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -1026,7 +1026,7 @@ class Html {
 	/**
 	 * Determines if the given MIME type is xml.
 	 *
-	 * @param string $mimetype MIME type
+	 * @param string $mimetype
 	 * @return bool
 	 */
 	public static function isXmlMimeType( $mimetype ) {
diff --git a/includes/Rest/Router.php b/includes/Rest/Router.php
index a89fdc35e04b..67a34baaa2fa 100644
--- a/includes/Rest/Router.php
+++ b/includes/Rest/Router.php
@@ -74,7 +74,7 @@ class Router {
 	/**
 	 * @param string[] $routeFiles List of names of JSON files containing routes
 	 * @param array $extraRoutes Extension route array
-	 * @param string $baseUrl The base URL
+	 * @param string $baseUrl
 	 * @param string $rootPath The base path for routes, relative to the base URL
 	 * @param BagOStuff $cacheBag A cache in which to store the matcher trees
 	 * @param ResponseFactory $responseFactory
diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php
index 9d7657b99f44..15b4a740327b 100644
--- a/includes/Storage/DerivedPageDataUpdater.php
+++ b/includes/Storage/DerivedPageDataUpdater.php
@@ -380,7 +380,7 @@ class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface {
 	 *
 	 * @see docs/pageupdater.md for documentation of the life cycle.
 	 *
-	 * @param string $newStage the new stage
+	 * @param string $newStage
 	 * @return string the previous stage
 	 *
 	 * @throws LogicException If a transition to the given stage is not possible in the current
@@ -400,7 +400,7 @@ class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface {
 	 *
 	 * @see docs/pageupdater.md for documentation of the life cycle.
 	 *
-	 * @param string $newStage the new stage
+	 * @param string $newStage
 	 *
 	 * @throws LogicException If this instance is not in the expected stage
 	 */
diff --git a/includes/Storage/NameTableStoreFactory.php b/includes/Storage/NameTableStoreFactory.php
index 2354cc8be923..825976decfd9 100644
--- a/includes/Storage/NameTableStoreFactory.php
+++ b/includes/Storage/NameTableStoreFactory.php
@@ -85,7 +85,7 @@ class NameTableStoreFactory {
 	/**
 	 * Get a NameTableStore for a specific table
 	 *
-	 * @param string $tableName The table name
+	 * @param string $tableName
 	 * @param string|false $wiki The target wiki ID, or false for the current wiki
 	 * @return NameTableStore
 	 */
diff --git a/includes/api/ApiModuleManager.php b/includes/api/ApiModuleManager.php
index 7f4bb8b041d4..0eca0d96fbd7 100644
--- a/includes/api/ApiModuleManager.php
+++ b/includes/api/ApiModuleManager.php
@@ -130,7 +130,7 @@ class ApiModuleManager extends ContextSource {
 	/**
 	 * Get module instance by name, or instantiate it if it does not exist
 	 *
-	 * @param string $moduleName Module name
+	 * @param string $moduleName
 	 * @param string|null $group Optionally validate that the module is in a specific group
 	 * @param bool $ignoreCache If true, force-creates a new instance and does not cache it
 	 *
@@ -237,7 +237,7 @@ class ApiModuleManager extends ContextSource {
 
 	/**
 	 * Returns true if the specific module is defined at all or in a specific group.
-	 * @param string $moduleName Module name
+	 * @param string $moduleName
 	 * @param string|null $group Group name to check against, or null to check all groups,
 	 * @return bool True if defined
 	 */
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 361b96143f5e..48cc33f401ee 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -348,7 +348,7 @@ class ApiPageSet extends ApiBase {
 	/**
 	 * Request an additional field from the page table.
 	 * Must be called before execute()
-	 * @param string $fieldName Field name
+	 * @param string $fieldName
 	 */
 	public function requestField( $fieldName ) {
 		$this->mRequestedPageFields[$fieldName] = null;
@@ -357,7 +357,7 @@ class ApiPageSet extends ApiBase {
 	/**
 	 * Get the value of a custom field previously requested through
 	 * requestField()
-	 * @param string $fieldName Field name
+	 * @param string $fieldName
 	 * @return mixed Field value
 	 */
 	public function getCustomField( $fieldName ) {
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 7d91d3e88989..27f4b42c60ec 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -470,7 +470,7 @@ abstract class ApiQueryBase extends ApiBase {
 
 	/**
 	 * Add a sub-element under the page element with the given page ID
-	 * @param int $pageId Page ID
+	 * @param int $pageId
 	 * @param array $data Data array à la ApiResult
 	 * @return bool Whether the element fit in the result
 	 */
@@ -485,7 +485,7 @@ abstract class ApiQueryBase extends ApiBase {
 
 	/**
 	 * Same as addPageSubItems(), but one element of $data at a time
-	 * @param int $pageId Page ID
+	 * @param int $pageId
 	 * @param mixed $item Data à la ApiResult
 	 * @param string|null $elemname XML element name. If null, getModuleName()
 	 *  is used
@@ -522,7 +522,7 @@ abstract class ApiQueryBase extends ApiBase {
 	 * $namespace should always be specified in order to handle per-namespace
 	 * capitalization settings.
 	 *
-	 * @param string $titlePart Title part
+	 * @param string $titlePart
 	 * @param int $namespace Namespace of the title
 	 * @return string DBkey (no namespace prefix)
 	 */
@@ -548,7 +548,7 @@ abstract class ApiQueryBase extends ApiBase {
 	 * Convert an input title or title prefix into a TitleValue.
 	 *
 	 * @since 1.35
-	 * @param string $titlePart Title part
+	 * @param string $titlePart
 	 * @param int $defaultNamespace Default namespace if none is given
 	 * @return TitleValue
 	 */
diff --git a/includes/block/BlockUser.php b/includes/block/BlockUser.php
index 1bf9ae623df8..cf7a4f1a1b6c 100644
--- a/includes/block/BlockUser.php
+++ b/includes/block/BlockUser.php
@@ -189,7 +189,7 @@ class BlockUser {
 	 * @param Authority $performer Performer of the block
 	 * @param string $expiry Expiry of the block (timestamp or 'infinity')
 	 * @param string $reason Reason of the block
-	 * @param bool[] $blockOptions Block options
+	 * @param bool[] $blockOptions
 	 *    Valid options:
 	 *    - isCreateAccountBlocked      : Are acount creations prevented?
 	 *    - isEmailBlocked              : Is emailing other users prevented?
@@ -200,7 +200,7 @@ class BlockUser {
 	 *    - isHideUser                  : Should blocked user's name be hiden (needs hideuser)?
 	 *    - isPartial                   : Is this block partial? This is ignored when
 	 *                                    blockRestrictions is not an empty array.
-	 * @param array $blockRestrictions Block restrictions
+	 * @param array $blockRestrictions
 	 * @param string[] $tags Tags that should be assigned to the log entry
 	 */
 	public function __construct(
diff --git a/includes/block/BlockUserFactory.php b/includes/block/BlockUserFactory.php
index da6faa1f1242..f42407daeb68 100644
--- a/includes/block/BlockUserFactory.php
+++ b/includes/block/BlockUserFactory.php
@@ -35,8 +35,8 @@ interface BlockUserFactory {
 	 * @param Authority $performer Performer of the block
 	 * @param string $expiry Expiry of the block (timestamp or 'infinity')
 	 * @param string $reason Reason of the block
-	 * @param array $blockOptions Block options
-	 * @param array $blockRestrictions Block restrictions
+	 * @param array $blockOptions
+	 * @param array $blockRestrictions
 	 * @param array|null $tags Tags that should be assigned to the log entry
 	 *
 	 * @return BlockUser
diff --git a/includes/block/UserBlockCommandFactory.php b/includes/block/UserBlockCommandFactory.php
index a4f958c27359..69a98d3b7da8 100644
--- a/includes/block/UserBlockCommandFactory.php
+++ b/includes/block/UserBlockCommandFactory.php
@@ -119,8 +119,8 @@ class UserBlockCommandFactory implements BlockUserFactory, UnblockUserFactory {
 	 * @param Authority $performer Performer of the block
 	 * @param string $expiry Expiry of the block (timestamp or 'infinity')
 	 * @param string $reason Reason of the block
-	 * @param array $blockOptions Block options
-	 * @param array $blockRestrictions Block restrictions
+	 * @param array $blockOptions
+	 * @param array $blockRestrictions
 	 * @param array|null $tags Tags that should be assigned to the log entry
 	 *
 	 * @return BlockUser
diff --git a/includes/cache/Hook/BacklinkCacheGetPrefixHook.php b/includes/cache/Hook/BacklinkCacheGetPrefixHook.php
index d758cb7cdc00..3f9df648d085 100644
--- a/includes/cache/Hook/BacklinkCacheGetPrefixHook.php
+++ b/includes/cache/Hook/BacklinkCacheGetPrefixHook.php
@@ -16,7 +16,7 @@ interface BacklinkCacheGetPrefixHook {
 	 * @since 1.35
 	 *
 	 * @param string $table Table name
-	 * @param string &$prefix Prefix
+	 * @param string &$prefix
 	 * @return bool|void True or no return value to continue or false to abort
 	 */
 	public function onBacklinkCacheGetPrefix( $table, &$prefix );
diff --git a/includes/cache/UserCache.php b/includes/cache/UserCache.php
index d9098a247a4b..55176dece805 100644
--- a/includes/cache/UserCache.php
+++ b/includes/cache/UserCache.php
@@ -69,7 +69,7 @@ class UserCache {
 	/**
 	 * Get a property of a user based on their user ID
 	 *
-	 * @param int $userId User ID
+	 * @param int $userId
 	 * @param string $prop User property
 	 * @return mixed|bool The property or false if the user does not exist
 	 */
diff --git a/includes/changes/ChangesListFilterGroup.php b/includes/changes/ChangesListFilterGroup.php
index e69f91cd954c..4e061c2bdf1b 100644
--- a/includes/changes/ChangesListFilterGroup.php
+++ b/includes/changes/ChangesListFilterGroup.php
@@ -207,7 +207,7 @@ abstract class ChangesListFilterGroup {
 	/**
 	 * Creates a filter of the appropriate type for this group, from the definition
 	 *
-	 * @param array $filterDefinition Filter definition
+	 * @param array $filterDefinition
 	 * @return ChangesListFilter Filter
 	 */
 	abstract protected function createFilter( array $filterDefinition );
diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php
index f91b4bba7122..b2a486149a46 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -396,7 +396,7 @@ class LinksUpdate extends DataUpdate {
 	 * @param string $table Table to use (e.g. 'templatelinks')
 	 * @param string $action Triggering action
 	 * @param string $userName Triggering user name
-	 * @param BacklinkCache|null $backlinkCache Backlink cache
+	 * @param BacklinkCache|null $backlinkCache
 	 */
 	public static function queueRecursiveJobsForTable(
 		PageIdentity $page, $table, $action = 'unknown', $userName = 'unknown', ?BacklinkCache $backlinkCache = null
diff --git a/includes/filerepo/Hook/LocalFile__getHistoryHook.php b/includes/filerepo/Hook/LocalFile__getHistoryHook.php
index 83bcfb8021e8..dadf95c2eec7 100644
--- a/includes/filerepo/Hook/LocalFile__getHistoryHook.php
+++ b/includes/filerepo/Hook/LocalFile__getHistoryHook.php
@@ -19,7 +19,7 @@ interface LocalFile__getHistoryHook {
 	 * @since 1.35
 	 *
 	 * @param File $file
-	 * @param array &$tables Tables
+	 * @param array &$tables
 	 * @param array &$fields Select fields
 	 * @param array &$conds Conditions
 	 * @param array &$opts Query options
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index de561543eee3..01536cab20c0 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -333,8 +333,8 @@ abstract class DatabaseUpdater {
 	 *
 	 * @since 1.21
 	 *
-	 * @param string $tableName The table name
-	 * @param string $indexName The index name
+	 * @param string $tableName
+	 * @param string $indexName
 	 * @param string $sqlPath The path to the SQL change path
 	 */
 	public function dropExtensionIndex( $tableName, $indexName, $sqlPath ) {
@@ -360,9 +360,9 @@ abstract class DatabaseUpdater {
 	 *
 	 * @since 1.21
 	 *
-	 * @param string $tableName The table name
-	 * @param string $oldIndexName The old index name
-	 * @param string $newIndexName The new index name
+	 * @param string $tableName
+	 * @param string $oldIndexName
+	 * @param string $newIndexName
 	 * @param string $sqlPath The path to the SQL change path
 	 * @param bool $skipBothIndexExistWarning Whether to warn if both the old
 	 * and the new indexes exist. [facultative; by default, false]
@@ -387,7 +387,7 @@ abstract class DatabaseUpdater {
 	 *
 	 * @since 1.21
 	 *
-	 * @param string $tableName The table name
+	 * @param string $tableName
 	 * @param string $fieldName The field to be modified
 	 * @param string $sqlPath The path to the SQL patch
 	 */
@@ -401,7 +401,7 @@ abstract class DatabaseUpdater {
 	 *
 	 * @since 1.31
 	 *
-	 * @param string $tableName The table name
+	 * @param string $tableName
 	 * @param string $sqlPath The path to the SQL patch
 	 */
 	public function modifyExtensionTable( $tableName, $sqlPath ) {
diff --git a/includes/libs/ParamValidator/ValidationException.php b/includes/libs/ParamValidator/ValidationException.php
index 286bc9feaa99..e37820aff598 100644
--- a/includes/libs/ParamValidator/ValidationException.php
+++ b/includes/libs/ParamValidator/ValidationException.php
@@ -29,7 +29,7 @@ class ValidationException extends UnexpectedValueException {
 
 	/**
 	 * @stable to call
-	 * @param DataMessageValue $failureMessage Failure message.
+	 * @param DataMessageValue $failureMessage
 	 * @param string $name Parameter name being validated
 	 * @param mixed $value Value of the parameter
 	 * @param array $settings Settings array being used for validation
diff --git a/includes/libs/filebackend/FSFileBackend.php b/includes/libs/filebackend/FSFileBackend.php
index fbbce2496d5a..852ee8337831 100644
--- a/includes/libs/filebackend/FSFileBackend.php
+++ b/includes/libs/filebackend/FSFileBackend.php
@@ -184,7 +184,7 @@ class FSFileBackend extends FileBackendStore {
 	/**
 	 * Get the absolute file system path for a storage path
 	 *
-	 * @param string $storagePath Storage path
+	 * @param string $storagePath
 	 * @return string|null
 	 */
 	protected function resolveToFSPath( $storagePath ) {
@@ -972,7 +972,7 @@ class FSFileBackend extends FileBackendStore {
 	/**
 	 * Clean up directory separators for the given OS
 	 *
-	 * @param string $fsPath FS path
+	 * @param string $fsPath
 	 * @return string
 	 */
 	protected function cleanPathSlashes( $fsPath ) {
diff --git a/includes/libs/filebackend/FileBackendStore.php b/includes/libs/filebackend/FileBackendStore.php
index 63bc2f032bfb..168d2d1135b1 100644
--- a/includes/libs/filebackend/FileBackendStore.php
+++ b/includes/libs/filebackend/FileBackendStore.php
@@ -1694,7 +1694,7 @@ abstract class FileBackendStore extends FileBackend {
 	 * Container dirs like "a", where the container shards on "x/xy",
 	 * can reside on several shards. Such paths are tricky to handle.
 	 *
-	 * @param string $storagePath Storage path
+	 * @param string $storagePath
 	 * @return bool
 	 */
 	final public function isSingleShardPathInternal( $storagePath ) {
diff --git a/includes/libs/filebackend/MemoryFileBackend.php b/includes/libs/filebackend/MemoryFileBackend.php
index 82f196263f23..6e57af9eb3d2 100644
--- a/includes/libs/filebackend/MemoryFileBackend.php
+++ b/includes/libs/filebackend/MemoryFileBackend.php
@@ -253,7 +253,7 @@ class MemoryFileBackend extends FileBackendStore {
 	/**
 	 * Get the absolute file system path for a storage path
 	 *
-	 * @param string $storagePath Storage path
+	 * @param string $storagePath
 	 * @return string|null
 	 */
 	protected function resolveHashKey( $storagePath ) {
diff --git a/includes/libs/mime/MSCompoundFileReader.php b/includes/libs/mime/MSCompoundFileReader.php
index e99de103a4fd..7a5a900ae2db 100644
--- a/includes/libs/mime/MSCompoundFileReader.php
+++ b/includes/libs/mime/MSCompoundFileReader.php
@@ -89,7 +89,7 @@ class MSCompoundFileReader {
 	/**
 	 * Read from an open seekable handle
 	 *
-	 * @param resource $fileHandle The file handle
+	 * @param resource $fileHandle
 	 * @return array An associative array of information about the file:
 	 *    - valid: true if the file is valid, false otherwise
 	 *    - error: An error message in English, should be present if valid=false
diff --git a/includes/libs/objectcache/wancache/WANObjectCache.php b/includes/libs/objectcache/wancache/WANObjectCache.php
index c14008511b7c..a621b5641bac 100644
--- a/includes/libs/objectcache/wancache/WANObjectCache.php
+++ b/includes/libs/objectcache/wancache/WANObjectCache.php
@@ -2670,7 +2670,7 @@ class WANObjectCache implements
 	}
 
 	/**
-	 * @param string $sisterKey Sister key
+	 * @param string $sisterKey
 	 * @param string $route Key routing prefix
 	 * @return string
 	 */
diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index f533fc900315..ef4b556f0824 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -373,7 +373,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 	 * @param string|null $password User password {@see connectionParams}
 	 * @param string|null $db Database name
 	 * @param string|null $schema Database schema name
-	 * @param string $tablePrefix Table prefix
+	 * @param string $tablePrefix
 	 * @throws DBConnectionError
 	 */
 	abstract protected function open( $server, $user, $password, $db, $schema, $tablePrefix );
@@ -3787,8 +3787,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 	/**
 	 * @stable to override
-	 * @param array $insertOptions INSERT options
-	 * @param array $selectOptions SELECT options
+	 * @param array $insertOptions
+	 * @param array $selectOptions
 	 * @return bool Whether an INSERT SELECT with these options will be replication safe
 	 * @since 1.31
 	 */
diff --git a/includes/libs/rdbms/dbal/EnumType.php b/includes/libs/rdbms/dbal/EnumType.php
index 32751b91f918..19910e62fd65 100644
--- a/includes/libs/rdbms/dbal/EnumType.php
+++ b/includes/libs/rdbms/dbal/EnumType.php
@@ -52,7 +52,7 @@ class EnumType extends Type {
 	/**
 	 * Gets the sql portion to create ENUM for Postgres table column
 	 *
-	 * @param mixed[] $column Column
+	 * @param mixed[] $column
 	 * @param AbstractPlatform $platform
 	 *
 	 * @see MWPostgreSqlPlatform::_getCreateTableSQL()
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index beb44532caa4..568871ae7a31 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -765,7 +765,7 @@ abstract class LBFactory implements ILBFactory {
 	/**
 	 * Build a string conveying the client and write index of the chronology protector data
 	 *
-	 * @param int $writeIndex Write index
+	 * @param int $writeIndex
 	 * @param int $time UNIX timestamp; can be used to detect stale cookies (T190082)
 	 * @param string $clientId Client ID hash from ILBFactory::shutdown()
 	 * @return string Value to use for "cpPosIndex" cookie
diff --git a/includes/parser/DateFormatter.php b/includes/parser/DateFormatter.php
index b42f7dd9eaa5..ed5fe211a5ad 100644
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -283,7 +283,7 @@ class DateFormatter {
 
 	/**
 	 * Makes an ISO month, e.g. 02, from a month name
-	 * @param string $monthName Month name
+	 * @param string $monthName
 	 * @return string|false ISO month name, or false if the input was invalid
 	 */
 	private function makeIsoMonth( $monthName ) {
diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index e8a92c535713..b3c06684e250 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -117,7 +117,7 @@ class ResourceLoader implements LoggerAwareInterface {
 	/**
 	 * Load information stored in the database and dependency tracking store about modules
 	 *
-	 * @param string[] $moduleNames Module names
+	 * @param string[] $moduleNames
 	 * @param ResourceLoaderContext $context ResourceLoader-specific context of the request
 	 */
 	public function preloadModuleInfo( array $moduleNames, ResourceLoaderContext $context ) {
@@ -514,7 +514,7 @@ class ResourceLoader implements LoggerAwareInterface {
 
 	/**
 	 * @internal Exposed for letting getModule() pass the callable to DependencyStore
-	 * @param string $moduleName Module name
+	 * @param string $moduleName
 	 * @param string $variant Language/skin variant
 	 * @return string[] List of absolute file paths
 	 */
@@ -526,7 +526,7 @@ class ResourceLoader implements LoggerAwareInterface {
 
 	/**
 	 * @internal Exposed for letting getModule() pass the callable to DependencyStore
-	 * @param string $moduleName Module name
+	 * @param string $moduleName
 	 * @param string $variant Language/skin variant
 	 * @param string[] $paths List of relative paths referenced during computation
 	 * @param string[] $priorPaths List of relative paths tracked in the dependency store
diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index ac918e3f2dc0..68c42684f37d 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -1057,7 +1057,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 	 * If the file does not exist or cannot be read, returns an empty string.
 	 *
 	 * @since 1.26 Uses MD4 instead of SHA1.
-	 * @param string $filePath File path
+	 * @param string $filePath
 	 * @return string Hash
 	 */
 	protected static function safeFileHash( $filePath ) {
diff --git a/includes/revisiondelete/RevisionDeleteUser.php b/includes/revisiondelete/RevisionDeleteUser.php
index 496d64cd4801..9959541a739d 100644
--- a/includes/revisiondelete/RevisionDeleteUser.php
+++ b/includes/revisiondelete/RevisionDeleteUser.php
@@ -38,7 +38,7 @@ class RevisionDeleteUser {
 	 * Update *_deleted bitfields in various tables to hide or unhide usernames
 	 *
 	 * @param string $name Username
-	 * @param int $userId User id
+	 * @param int $userId
 	 * @param string $op Operator '|' or '&'
 	 * @param null|IDatabase $dbw If you happen to have one lying around
 	 * @return bool True on success, false on failure (e.g. invalid user ID)
diff --git a/includes/search/SearchSuggestion.php b/includes/search/SearchSuggestion.php
index 8547bb9207d0..3d731abd0b0e 100644
--- a/includes/search/SearchSuggestion.php
+++ b/includes/search/SearchSuggestion.php
@@ -53,8 +53,8 @@ class SearchSuggestion {
 	/**
 	 * @param float $score the suggestion score
 	 * @param string|null $text the suggestion text
-	 * @param Title|null $suggestedTitle the suggested title
-	 * @param int|null $suggestedTitleID the suggested title ID
+	 * @param Title|null $suggestedTitle
+	 * @param int|null $suggestedTitleID
 	 */
 	public function __construct( $score, $text = null, Title $suggestedTitle = null,
 			$suggestedTitleID = null ) {
diff --git a/includes/specials/Hook/UploadFormSourceDescriptorsHook.php b/includes/specials/Hook/UploadFormSourceDescriptorsHook.php
index e9ccfdcbb24e..b582eaa91988 100644
--- a/includes/specials/Hook/UploadFormSourceDescriptorsHook.php
+++ b/includes/specials/Hook/UploadFormSourceDescriptorsHook.php
@@ -17,7 +17,7 @@ interface UploadFormSourceDescriptorsHook {
 	 *
 	 * @param array &$descriptor The HTMLForm descriptor
 	 * @param bool &$radio Boolean, if source type should be shown as radio button
-	 * @param string $selectedSourceType The selected source type
+	 * @param string $selectedSourceType
 	 * @return bool|void True or no return value to continue or false to abort
 	 */
 	public function onUploadFormSourceDescriptors( &$descriptor, &$radio,
diff --git a/includes/specials/Hook/UploadForm_getInitialPageTextHook.php b/includes/specials/Hook/UploadForm_getInitialPageTextHook.php
index d6b5903ff44b..49366b0fb0b4 100644
--- a/includes/specials/Hook/UploadForm_getInitialPageTextHook.php
+++ b/includes/specials/Hook/UploadForm_getInitialPageTextHook.php
@@ -20,7 +20,7 @@ interface UploadForm_getInitialPageTextHook {
 	 *
 	 * @since 1.35
 	 *
-	 * @param string &$pageText The page text
+	 * @param string &$pageText
 	 * @param string[] $msg Array of header messages
 	 * @param Config $config
 	 * @return bool|void True or no return value to continue or false to abort
diff --git a/includes/specials/SpecialEmailUser.php b/includes/specials/SpecialEmailUser.php
index 90b2deb868fd..eb542b1500d2 100644
--- a/includes/specials/SpecialEmailUser.php
+++ b/includes/specials/SpecialEmailUser.php
@@ -260,7 +260,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 	 * Check whether a user is allowed to send email
 	 *
 	 * @param User $user
-	 * @param string $editToken Edit token
+	 * @param string $editToken
 	 * @param Config|null $config optional for backwards compatibility
 	 * @return null|string|array Null on success, string on error, or array on
 	 *  hook error
diff --git a/includes/user/BotPassword.php b/includes/user/BotPassword.php
index 2f9c0bb352df..3e9f662964ff 100644
--- a/includes/user/BotPassword.php
+++ b/includes/user/BotPassword.php
@@ -283,7 +283,7 @@ class BotPassword implements IDBAccessObject {
 
 	/**
 	 * Invalidate all passwords for a user, by name
-	 * @param string $username User name
+	 * @param string $username
 	 * @return bool Whether any passwords were invalidated
 	 */
 	public static function invalidateAllPasswordsForUser( $username ) {
@@ -321,7 +321,7 @@ class BotPassword implements IDBAccessObject {
 
 	/**
 	 * Remove all passwords for a user, by name
-	 * @param string $username User name
+	 * @param string $username
 	 * @return bool Whether any passwords were removed
 	 */
 	public static function removeAllPasswordsForUser( $username ) {
diff --git a/includes/user/BotPasswordStore.php b/includes/user/BotPasswordStore.php
index 847c069a1955..7d7708a963de 100644
--- a/includes/user/BotPasswordStore.php
+++ b/includes/user/BotPasswordStore.php
@@ -366,7 +366,7 @@ class BotPasswordStore implements IDBAccessObject {
 
 	/**
 	 * Invalidate all passwords for a user, by name
-	 * @param string $username User name
+	 * @param string $username
 	 * @return bool Whether any passwords were invalidated
 	 */
 	public function invalidateUserPasswords( string $username ): bool {
@@ -395,7 +395,7 @@ class BotPasswordStore implements IDBAccessObject {
 
 	/**
 	 * Remove all passwords for a user, by name
-	 * @param string $username User name
+	 * @param string $username
 	 * @return bool Whether any passwords were removed
 	 */
 	public function removeUserPasswords( string $username ): bool {
diff --git a/includes/widget/CheckMatrixWidget.php b/includes/widget/CheckMatrixWidget.php
index 9da84d4b0f2a..c0cad2bdd2cc 100644
--- a/includes/widget/CheckMatrixWidget.php
+++ b/includes/widget/CheckMatrixWidget.php
@@ -149,7 +149,7 @@ class CheckMatrixWidget extends \OOUI\Widget {
 	 * Check whether the given tag's checkbox should
 	 * be checked
 	 *
-	 * @param string $tagName Tag name
+	 * @param string $tagName
 	 * @return bool Tag should be checked
 	 */
 	private function isTagChecked( $tagName ) {
@@ -163,7 +163,7 @@ class CheckMatrixWidget extends \OOUI\Widget {
 	 * Check whether the given tag's checkbox should
 	 * be disabled
 	 *
-	 * @param string $tagName Tag name
+	 * @param string $tagName
 	 * @return bool Tag should be disabled
 	 */
 	private function isTagDisabled( $tagName ) {
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 55e56a96ff65..64624156eaba 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -648,7 +648,7 @@ class NamespaceDupes extends Maintenance {
 	 * Merge page histories
 	 *
 	 * @param stdClass $row Page row
-	 * @param Title $newTitle The new title
+	 * @param Title $newTitle
 	 * @return bool
 	 */
 	private function mergePage( $row, Title $newTitle ) {
diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php
index b2827760a113..86bdef3d54b6 100644
--- a/tests/phpunit/MediaWikiIntegrationTestCase.php
+++ b/tests/phpunit/MediaWikiIntegrationTestCase.php
@@ -2315,7 +2315,7 @@ abstract class MediaWikiIntegrationTestCase extends PHPUnit\Framework\TestCase {
 	/**
 	 * Registers the given hook handler for the duration of the current test case.
 	 *
-	 * @param string $hookName Hook name
+	 * @param string $hookName
 	 * @param mixed $handler Value suitable for a hook handler
 	 * @param bool $replace (optional) Default is to replace all existing handlers for the given hook.
 	 *        Set false to add to existing handler list.
diff --git a/tests/phpunit/includes/parser/ParserOptionsTest.php b/tests/phpunit/includes/parser/ParserOptionsTest.php
index e93e0b83cb94..332f1403ab73 100644
--- a/tests/phpunit/includes/parser/ParserOptionsTest.php
+++ b/tests/phpunit/includes/parser/ParserOptionsTest.php
@@ -130,7 +130,7 @@ class ParserOptionsTest extends MediaWikiLangTestCase {
 
 	/**
 	 * @dataProvider provideOptionsHash
-	 * @param array $usedOptions Used options
+	 * @param array $usedOptions
 	 * @param string $expect Expected value
 	 * @param array $options Options to set
 	 * @param array $globals Globals to set
diff --git a/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php b/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
index c6ec087b092c..64ee232bda19 100644
--- a/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
+++ b/tests/phpunit/unit/includes/changes/ChangesListStringOptionsFilterGroupTest.php
@@ -171,7 +171,7 @@ class ChangesListStringOptionsFilterGroupTest extends MediaWikiUnitTestCase {
 	}
 
 	/**
-	 * @param array $groupDefinition Group definition
+	 * @param array $groupDefinition
 	 * @param string $input Value in URL
 	 */
 	protected function modifyQueryHelper( $groupDefinition, $input ) {