diff options
39 files changed, 45 insertions, 45 deletions
diff --git a/includes/FauxRequest.php b/includes/FauxRequest.php index 3b2283b77a8a..9147240ac408 100644 --- a/includes/FauxRequest.php +++ b/includes/FauxRequest.php @@ -126,7 +126,7 @@ class FauxRequest extends WebRequest { /** * @since 1.26 - * @param string $name Unprefixed name of the cookie to set + * @param string $key Unprefixed name of the cookie to set * @param string|null $value Value of the cookie to set * @param string|null $prefix Cookie prefix. Defaults to $wgCookiePrefix */ diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index b35a1f05c976..49159ed3dfe4 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2234,7 +2234,8 @@ function wfIniGetBool( $setting ) { * (https://bugs.php.net/bug.php?id=26285) and the locale problems on Linux in * PHP 5.2.6+ (bug backported to earlier distro releases of PHP). * - * @param string ... strings to escape and glue together, or a single array of strings parameter + * @param string $args,... strings to escape and glue together, + * or a single array of strings parameter * @return string */ function wfEscapeShellArg( /*...*/ ) { diff --git a/includes/Message.php b/includes/Message.php index be6b0aff0fd7..8777c6fee141 100644 --- a/includes/Message.php +++ b/includes/Message.php @@ -488,7 +488,7 @@ class Message implements MessageSpecifier, Serializable { * * @since 1.17 * - * @param mixed ... Parameters as strings or arrays from + * @param mixed $args,... Parameters as strings or arrays from * Message::numParam() and the like, or a single array of parameters. * * @return Message $this diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 57cb194af19f..8f62a8590984 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -688,7 +688,7 @@ class OutputPage extends ContextSource { * Add one or more head items to the output * * @since 1.28 - * @param string|string[] $value Raw HTML + * @param string|string[] $values Raw HTML */ public function addHeadItems( $values ) { $this->mHeadItems = array_merge( $this->mHeadItems, (array)$values ); @@ -3797,7 +3797,7 @@ class OutputPage extends ContextSource { * Caller is responsible for ensuring the file exists. Emits a PHP warning otherwise. * * @since 1.27 - * @param string $remotePath URL path prefix that points to $localPath + * @param string $remotePathPrefix URL path prefix that points to $localPath * @param string $localPath File directory exposed at $remotePath * @param string $file Path to target file relative to $localPath * @return string URL diff --git a/includes/api/ApiAuthManagerHelper.php b/includes/api/ApiAuthManagerHelper.php index 3a9fb738b07d..d6b9f7612fbb 100644 --- a/includes/api/ApiAuthManagerHelper.php +++ b/includes/api/ApiAuthManagerHelper.php @@ -229,8 +229,8 @@ class ApiAuthManagerHelper { /** * Logs successful or failed authentication. - * @param string|AuthenticationResponse $result Response or error message * @param string $event Event type (e.g. 'accountcreation') + * @param string|AuthenticationResponse $result Response or error message */ public function logAuthenticationResult( $event, $result ) { if ( is_string( $result ) ) { @@ -345,7 +345,7 @@ class ApiAuthManagerHelper { /** * Fetch the standard parameters this helper recognizes * @param string $action AuthManager action - * @param string $param... Parameters to use + * @param string $param,... Parameters to use * @return array */ public static function getStandardParams( $action, $param /* ... */ ) { diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 81696e03489d..2012e7d8cf81 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -668,7 +668,7 @@ abstract class ApiBase extends ContextSource { /** * Set the continuation manager - * @param ApiContinuationManager|null + * @param ApiContinuationManager|null $manager */ public function setContinuationManager( $manager ) { // Main module has setContinuationManager() method overridden diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php index 646823573d29..f6dd5248868d 100644 --- a/includes/api/ApiMain.php +++ b/includes/api/ApiMain.php @@ -370,7 +370,7 @@ class ApiMain extends ApiBase { /** * Set the continuation manager - * @param ApiContinuationManager|null + * @param ApiContinuationManager|null $manager */ public function setContinuationManager( $manager ) { if ( $manager !== null ) { diff --git a/includes/api/SearchApi.php b/includes/api/SearchApi.php index fb9c4e67d928..552292bc36f5 100644 --- a/includes/api/SearchApi.php +++ b/includes/api/SearchApi.php @@ -144,7 +144,7 @@ trait SearchApi { * one ( to support the continue parameter ) * - namespace: mandatory * - search engine profiles defined by SearchApi::getSearchProfileParams() - * @param string[]|null API request params (must be sanitized by + * @param string[]|null $params API request params (must be sanitized by * ApiBase::extractRequestParams() before) * @return SearchEngine the search engine */ diff --git a/includes/collation/CustomUppercaseCollation.php b/includes/collation/CustomUppercaseCollation.php index 1b96bff27e50..301972d90cd8 100644 --- a/includes/collation/CustomUppercaseCollation.php +++ b/includes/collation/CustomUppercaseCollation.php @@ -48,7 +48,7 @@ class CustomUppercaseCollation extends NumericUppercaseCollation { * @note This assumes $alphabet does not contain U+F3000-U+F303F * * @param array $alphabet Sorted array of uppercase characters. - * @param Language $language What language for number sorting. + * @param Language $lang What language for number sorting. */ public function __construct( array $alphabet, Language $lang ) { // It'd be trivial to extend this past 64, you'd just diff --git a/includes/context/ContextSource.php b/includes/context/ContextSource.php index 434201a174ac..cea84605eaaa 100644 --- a/includes/context/ContextSource.php +++ b/includes/context/ContextSource.php @@ -183,7 +183,7 @@ abstract class ContextSource implements IContextSource { * @since 1.18 * @param string|string[]|MessageSpecifier $key Message key, or array of keys, * or a MessageSpecifier. - * @param mixed ... + * @param mixed $args,... * @return Message */ public function msg( $key /* $args */ ) { diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php index 2ac41925d831..4a772eecd2a2 100644 --- a/includes/context/RequestContext.php +++ b/includes/context/RequestContext.php @@ -451,7 +451,7 @@ class RequestContext implements IContextSource, MutableContext { * * @param string|string[]|MessageSpecifier $key Message key, or array of keys, * or a MessageSpecifier. - * @param mixed ... + * @param mixed $args,... * @return Message */ public function msg( $key ) { diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index dda9e88012eb..7293b99e383a 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -271,7 +271,7 @@ class HTMLForm extends ContextSource { * Construct a HTMLForm object for given display type. May return a HTMLForm subclass. * * @param string $displayFormat - * @param mixed $arguments... Additional arguments to pass to the constructor. + * @param mixed $arguments,... Additional arguments to pass to the constructor. * @return HTMLForm */ public static function factory( $displayFormat/*, $arguments...*/ ) { diff --git a/includes/libs/MemoizedCallable.php b/includes/libs/MemoizedCallable.php index 01adeab5fc51..90c7a644c5aa 100644 --- a/includes/libs/MemoizedCallable.php +++ b/includes/libs/MemoizedCallable.php @@ -134,7 +134,7 @@ class MemoizedCallable { * * Like MemoizedCallable::invokeArgs(), but variadic. * - * @param mixed ...$params Parameters for memoized function or method. + * @param mixed $params,... Parameters for memoized function or method. * @return mixed The memoized callable's return value. */ public function invoke() { diff --git a/includes/libs/MultiHttpClient.php b/includes/libs/MultiHttpClient.php index 4f6195cc6d49..6c48cee1aee4 100644 --- a/includes/libs/MultiHttpClient.php +++ b/includes/libs/MultiHttpClient.php @@ -435,7 +435,7 @@ class MultiHttpClient implements LoggerAwareInterface { /** * Register a logger * - * @param LoggerInterface + * @param LoggerInterface $logger */ public function setLogger( LoggerInterface $logger ) { $this->logger = $logger; diff --git a/includes/libs/filebackend/FileBackend.php b/includes/libs/filebackend/FileBackend.php index 6f5108149e8d..51308c137141 100644 --- a/includes/libs/filebackend/FileBackend.php +++ b/includes/libs/filebackend/FileBackend.php @@ -1591,7 +1591,7 @@ abstract class FileBackend implements LoggerAwareInterface { * - StatusValue::newGood() if this method is called without parameters * - StatusValue::newFatal() with all parameters to this method if passed in * - * @param ... string + * @param string $args,... * @return StatusValue */ final protected function newStatus() { diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php index e0f27504cc5f..a262e0e18e07 100644 --- a/includes/libs/objectcache/BagOStuff.php +++ b/includes/libs/objectcache/BagOStuff.php @@ -747,7 +747,7 @@ abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface { * Make a global cache key. * * @since 1.27 - * @param string ... Key component (variadic) + * @param string $keys,... Key component * @return string */ public function makeGlobalKey() { @@ -758,7 +758,7 @@ abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface { * Make a cache key, scoped to this instance's keyspace. * * @since 1.27 - * @param string ... Key component (variadic) + * @param string $keys,... Key component * @return string */ public function makeKey() { diff --git a/includes/libs/objectcache/MultiWriteBagOStuff.php b/includes/libs/objectcache/MultiWriteBagOStuff.php index d94578dff12e..65f3a8afe5ad 100644 --- a/includes/libs/objectcache/MultiWriteBagOStuff.php +++ b/includes/libs/objectcache/MultiWriteBagOStuff.php @@ -174,7 +174,7 @@ class MultiWriteBagOStuff extends BagOStuff { * @param integer $count * @param bool $asyncWrites * @param string $method - * @param mixed ... + * @param mixed $args,... * @return bool */ protected function doWrite( $count, $asyncWrites, $method /*, ... */ ) { diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php index 4f90c7d77d06..a80ed8d66354 100644 --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@ -1315,7 +1315,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface { /** * @see BagOStuff::makeKey() - * @param string ... Key component + * @param string $keys,... Key component * @return string * @since 1.27 */ @@ -1325,7 +1325,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface { /** * @see BagOStuff::makeGlobalKey() - * @param string ... Key component + * @param string $keys,... Key component * @return string * @since 1.27 */ diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index b8b44e698eee..0726b5ab5aab 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -3190,7 +3190,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware * @see WANObjectCache::getWithSetCallback() * * @param IDatabase $db1 - * @param IDatabase ... + * @param IDatabase $dbs,... * @return array Map of values: * - lag: highest lag of any of the DBs or false on error (e.g. replication stopped) * - since: oldest UNIX timestamp of any of the DB lag estimates diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php b/includes/libs/rdbms/lbfactory/ILBFactory.php index 6e328f4b4cce..117df684c409 100644 --- a/includes/libs/rdbms/lbfactory/ILBFactory.php +++ b/includes/libs/rdbms/lbfactory/ILBFactory.php @@ -40,7 +40,7 @@ interface ILBFactory { * * Sub-classes will extend the required keys in $conf with additional parameters * - * @param $conf $params Array with keys: + * @param array $conf Array with keys: * - localDomain: A DatabaseDomain or domain ID string. * - readOnlyReason : Reason the master DB is read-only if so [optional] * - srvCache : BagOStuff object for server cache [optional] diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php index 2b09cca0519f..00d3bd33151f 100644 --- a/includes/logging/LogEventsList.php +++ b/includes/logging/LogEventsList.php @@ -60,7 +60,7 @@ class LogEventsList extends ContextSource { * * @param IContextSource|Skin $context Context to use; formerly it was * a Skin object. Use of Skin is deprecated. - * @param LinkRenderer|null $linkRenderer, previously unused + * @param LinkRenderer|null $linkRenderer previously unused * @param int $flags Can be a combination of self::NO_ACTION_LINK, * self::NO_EXTRA_USER_LINKS or self::USE_CHECKBOXES. */ diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php index 1f8489f7e3d4..cb07fd5c586f 100644 --- a/includes/mail/UserMailer.php +++ b/includes/mail/UserMailer.php @@ -102,7 +102,7 @@ class UserMailer { * @param MailAddress $from Sender's email * @param string $subject Email's subject. * @param string $body Email's text or Array of two strings to be the text and html bodies - * @param array $options: + * @param array $options Keys: * 'replyTo' MailAddress * 'contentType' string default 'text/plain; charset=UTF-8' * 'headers' array Extra headers to set @@ -196,7 +196,7 @@ class UserMailer { * @param MailAddress $from Sender's email * @param string $subject Email's subject. * @param string $body Email's text or Array of two strings to be the text and html bodies - * @param array $options: + * @param array $options Keys: * 'replyTo' MailAddress * 'contentType' string default 'text/plain; charset=UTF-8' * 'headers' array Extra headers to set diff --git a/includes/media/WebP.php b/includes/media/WebP.php index e2c2d2d19256..4555c198ae29 100644 --- a/includes/media/WebP.php +++ b/includes/media/WebP.php @@ -86,7 +86,7 @@ class WebPHandler extends BitmapHandler { /** * Extracts the image size and WebP type from a file * - * @param string $chunks Chunks as extracted by RiffExtractor + * @param string $filename * @return array|bool Header data array with entries 'compression', 'width' and 'height', * where 'compression' can be 'lossy', 'lossless', 'animated' or 'unknown'. False if * file is not a valid WebP file. diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index 73a99272c2f1..5e2845ffe2c7 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -761,7 +761,7 @@ class ParserOptions { * is it allowed in the specific case of parsing this page. * @see self::getAllowUnsafeRawHtml() * @since 1.29 - * @param bool|null Value to set or null to get current value + * @param bool|null $x Value to set or null to get current value * @return bool Current value for allowUnsafeRawHtml */ public function setAllowUnsafeRawHtml( $x ) { diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php index ad16420651c8..c58bb00b942e 100644 --- a/includes/resourceloader/ResourceLoader.php +++ b/includes/resourceloader/ResourceLoader.php @@ -655,7 +655,7 @@ class ResourceLoader implements LoggerAwareInterface { * * @since 1.26 * @param ResourceLoaderContext $context - * @param string[] $modules List of known module names + * @param string[] $moduleNames List of known module names * @return string Hash */ public function getCombinedVersion( ResourceLoaderContext $context, array $moduleNames ) { diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index f99114e2b96f..cbb0beca8d7b 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -224,7 +224,7 @@ class ResourceLoaderContext implements MessageLocalizer { * @since 1.27 * @param string|string[]|MessageSpecifier $key Message key, or array of keys, * or a MessageSpecifier. - * @param mixed ... + * @param mixed $args,... * @return Message */ public function msg( $key ) { diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php index 64a6aec806d5..a2c58e6741f7 100644 --- a/includes/revisiondelete/RevDelList.php +++ b/includes/revisiondelete/RevDelList.php @@ -402,7 +402,7 @@ abstract class RevDelList extends RevisionListBase { /** * A hook for setVisibility(): do any necessary updates post-commit. * STUB - * @param array [id => ['oldBits' => $oldBits, 'newBits' => $newBits], ... ] + * @param array $visibilityChangeMap [id => ['oldBits' => $oldBits, 'newBits' => $newBits], ... ] * @return Status */ public function doPostCommitUpdates( array $visibilityChangeMap ) { diff --git a/includes/search/SearchExactMatchRescorer.php b/includes/search/SearchExactMatchRescorer.php index 40cfe3930581..0e99ba91ff2f 100644 --- a/includes/search/SearchExactMatchRescorer.php +++ b/includes/search/SearchExactMatchRescorer.php @@ -35,8 +35,8 @@ class SearchExactMatchRescorer { * to not be in the results or be lower down the list. * @param string $search the query * @param int[] $namespaces the namespaces - * @param int $limit the max number of results to return * @param string[] $srchres results + * @param int $limit the max number of results to return * @return string[] munged results */ public function rescore( $search, $namespaces, $srchres, $limit ) { diff --git a/includes/search/SearchSuggestion.php b/includes/search/SearchSuggestion.php index 4e7c782e84de..7f433db4aed3 100644 --- a/includes/search/SearchSuggestion.php +++ b/includes/search/SearchSuggestion.php @@ -53,7 +53,7 @@ class SearchSuggestion { /** * Construct a new suggestion * @param float $score the suggestion score - * @param string $text|null the suggestion text + * @param string|null $text the suggestion text * @param Title|null $suggestedTitle the suggested title * @param int|null $suggestedTitleID the suggested title ID */ diff --git a/includes/session/PHPSessionHandler.php b/includes/session/PHPSessionHandler.php index 084ac05c9607..b76f0ff6b70f 100644 --- a/includes/session/PHPSessionHandler.php +++ b/includes/session/PHPSessionHandler.php @@ -145,7 +145,7 @@ class PHPSessionHandler implements \SessionHandlerInterface { * @private Use self::install(). * @param SessionManager $manager * @param BagOStuff $store - * @param LoggerInterface $store + * @param LoggerInterface $logger */ public function setManager( SessionManager $manager, BagOStuff $store, LoggerInterface $logger diff --git a/includes/session/SessionProvider.php b/includes/session/SessionProvider.php index 3cf69b7b3333..ba075e0ca87c 100644 --- a/includes/session/SessionProvider.php +++ b/includes/session/SessionProvider.php @@ -387,7 +387,7 @@ abstract class SessionProvider implements SessionProviderInterface, LoggerAwareI * reset whatever token it does use here. * * @protected For use by \MediaWiki\Session\SessionManager only - * @param User $user; + * @param User $user */ public function invalidateSessionsForUser( User $user ) { } diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php index aad676f8e38d..55f7a674f41f 100644 --- a/includes/skins/BaseTemplate.php +++ b/includes/skins/BaseTemplate.php @@ -29,7 +29,7 @@ abstract class BaseTemplate extends QuickTemplate { * Get a Message object with its context set * * @param string $name Message name - * @param ... $params Message params + * @param mixed $params,... Message params * @return Message */ public function getMsg( $name /* ... */ ) { diff --git a/includes/specials/SpecialFilepath.php b/includes/specials/SpecialFilepath.php index 49caaa3a1df9..c18faa12d37d 100644 --- a/includes/specials/SpecialFilepath.php +++ b/includes/specials/SpecialFilepath.php @@ -35,7 +35,7 @@ class SpecialFilepath extends RedirectSpecialPage { /** * Implement by redirecting through Special:Redirect/file. * - * @param string|null $subpage + * @param string|null $par * @return Title */ public function getRedirect( $par ) { diff --git a/includes/specials/SpecialMediaStatistics.php b/includes/specials/SpecialMediaStatistics.php index 44e0db85e2e9..83efbcbdbc8c 100644 --- a/includes/specials/SpecialMediaStatistics.php +++ b/includes/specials/SpecialMediaStatistics.php @@ -169,7 +169,7 @@ class MediaStatisticsPage extends QueryPage { * * @param string $mime mime type (e.g. image/jpeg) * @param int $count Number of images of this type - * @param int $totalBytes Total space for images of this type + * @param int $bytes Total space for images of this type */ protected function outputTableRow( $mime, $count, $bytes ) { $mimeSearch = SpecialPage::getTitleFor( 'MIMEsearch', $mime ); diff --git a/includes/user/User.php b/includes/user/User.php index d6b63a8e3165..71a427298e5b 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -3519,7 +3519,7 @@ class User implements IDBAccessObject { /** * Check if user is allowed to access a feature / make an action * - * @param string ... Permissions to test + * @param string $permissions,... Permissions to test * @return bool True if user is allowed to perform *any* of the given actions */ public function isAllowedAny() { @@ -3534,7 +3534,7 @@ class User implements IDBAccessObject { /** * - * @param string ... Permissions to test + * @param string $permissions,... Permissions to test * @return bool True if the user is allowed to perform *all* of the given actions */ public function isAllowedAll() { diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php index 8931e3ca17a8..19f5100a4c3c 100644 --- a/includes/utils/AutoloadGenerator.php +++ b/includes/utils/AutoloadGenerator.php @@ -372,7 +372,7 @@ class ClassCollector { /** * Accepts the next token in an expect sequence * - * @param array + * @param array $token */ protected function tryEndExpect( $token ) { switch ( $this->startToken[0] ) { diff --git a/phpcs.xml b/phpcs.xml index 3ea3048e1729..b1ad8d29ed76 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -10,7 +10,6 @@ <exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" /> <exclude name="MediaWiki.Commenting.FunctionComment.Missing.Protected" /> <exclude name="MediaWiki.Commenting.FunctionComment.Missing.Public" /> - <exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" /> <exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfter" /> <exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfterParamName" /> <exclude name="MediaWiki.Commenting.FunctionComment.SpacingAfterParamType" /> diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php index e57841854249..f694f3984c50 100644 --- a/tests/parser/ParserTestRunner.php +++ b/tests/parser/ParserTestRunner.php @@ -477,7 +477,7 @@ class ParserTestRunner { * @see staticSetup * * @param array $teardown The snippet array - * @param ScopedCallback|null A ScopedCallback to consume + * @param ScopedCallback|null $nextTeardown A ScopedCallback to consume * @return ScopedCallback */ protected function createTeardownObject( $teardown, $nextTeardown = null ) { diff --git a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php index 3b0019499da1..a4b980f04b92 100644 --- a/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php +++ b/tests/phpunit/includes/auth/LegacyHookPreAuthenticationProviderTest.php @@ -282,7 +282,7 @@ class LegacyHookPreAuthenticationProviderTest extends \MediaWikiTestCase { * @dataProvider provideTestForAccountCreation * @param string $msg * @param Status|null $status - * @param StatusValue Result + * @param StatusValue $result Result */ public function testTestForAccountCreation( $msg, $status, $result ) { $this->hook( 'AbortNewAccount', $this->once() ) |