Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371215 )

Change subject: Improve some parameter docs
......................................................................

Improve some parameter docs

Change-Id: I81e68310abcbc59964b22e0e74842d509f6b1fb9
---
M includes/FauxRequest.php
M includes/FileDeleteForm.php
M includes/MagicWord.php
M includes/MagicWordArray.php
M includes/OutputPage.php
M includes/ProtectionForm.php
M includes/Revision.php
M includes/SiteConfiguration.php
M includes/StubObject.php
M includes/Title.php
M includes/api/ApiAuthManagerHelper.php
M includes/api/ApiBase.php
M includes/api/ApiDelete.php
M includes/api/ApiParamInfo.php
M includes/api/ApiQueryBase.php
M includes/api/ApiQueryLogEvents.php
M includes/content/ContentHandler.php
M includes/content/JsonContent.php
M includes/content/TextContent.php
M includes/diff/DiffFormatter.php
M includes/gallery/TraditionalImageGallery.php
M includes/import/UploadSourceAdapter.php
M includes/import/WikiImporter.php
M includes/libs/ArrayUtils.php
M includes/libs/MultiHttpClient.php
M includes/libs/filebackend/SwiftFileBackend.php
M includes/libs/filebackend/fileop/FileOp.php
M includes/libs/lockmanager/ScopedLock.php
M includes/libs/objectcache/BagOStuff.php
M includes/libs/objectcache/WANObjectCache.php
M includes/libs/rdbms/database/DatabaseMysqlBase.php
M includes/libs/rdbms/lbfactory/ILBFactory.php
M includes/mail/UserMailer.php
M includes/page/Article.php
M includes/page/WikiPage.php
M includes/parser/LinkHolderArray.php
M includes/parser/Parser.php
M includes/revisiondelete/RevDelList.php
M includes/revisiondelete/RevisionDeleter.php
M includes/skins/Skin.php
40 files changed, 133 insertions(+), 124 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/371215/1

diff --git a/includes/FauxRequest.php b/includes/FauxRequest.php
index 3b2283b..2f7f75b 100644
--- a/includes/FauxRequest.php
+++ b/includes/FauxRequest.php
@@ -126,7 +126,7 @@
 
        /**
         * @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
         */
@@ -152,6 +152,7 @@
 
        /**
         * @since 1.25
+        * @param string $url
         */
        public function setRequestURL( $url ) {
                $this->requestUrl = $url;
@@ -160,6 +161,7 @@
        /**
         * @since 1.25 MWException( "getRequestURL not implemented" )
         * no longer thrown.
+        * @return string
         */
        public function getRequestURL() {
                if ( $this->requestUrl === null ) {
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 8a1cd35..8c843c4 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -143,9 +143,9 @@
        /**
         * Really delete the file
         *
-        * @param Title $title
-        * @param File $file
-        * @param string $oldimage Archive name
+        * @param Title &$title
+        * @param File &$file
+        * @param string &$oldimage Archive name
         * @param string $reason Reason of the deletion
         * @param bool $suppress Whether to mark all deleted versions as 
restricted
         * @param User $user User object performing the request
@@ -398,8 +398,8 @@
         * value was provided, does it correspond to an
         * existing, local, old version of this file?
         *
-        * @param File $file
-        * @param File $oldfile
+        * @param File &$file
+        * @param File &$oldfile
         * @param File $oldimage
         * @return bool
         */
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 1703179..e70b8ce 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -518,7 +518,7 @@
         * Returns true if the text matches the word, and alters the
         * input string, removing all instances of the word
         *
-        * @param string $text
+        * @param string &$text
         *
         * @return bool
         */
@@ -534,7 +534,7 @@
        }
 
        /**
-        * @param string $text
+        * @param string &$text
         * @return bool
         */
        public function matchStartAndRemove( &$text ) {
@@ -655,7 +655,7 @@
         *
         * @param array $magicarr
         * @param string $subject
-        * @param string $result
+        * @param string &$result
         *
         * @return bool
         */
@@ -677,7 +677,7 @@
         * Adds all the synonyms of this MagicWord to an array, to allow quick
         * lookup in a list of magic words
         *
-        * @param array $array
+        * @param array &$array
         * @param string $value
         */
        public function addToArray( &$array, $value ) {
diff --git a/includes/MagicWordArray.php b/includes/MagicWordArray.php
index 6a9ead5..7461191 100644
--- a/includes/MagicWordArray.php
+++ b/includes/MagicWordArray.php
@@ -260,7 +260,7 @@
         * Returns an associative array, ID => param value, for all items that 
match
         * Removes the matched items from the input string (passed by reference)
         *
-        * @param string $text
+        * @param string &$text
         *
         * @return array
         */
@@ -304,7 +304,7 @@
         * Return false if no match found and $text is not modified.
         * Does not match parameters.
         *
-        * @param string $text
+        * @param string &$text
         *
         * @return int|bool False on failure
         */
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 7a2cf00..bf864d2 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -571,6 +571,7 @@
         * @param bool $filter Whether to filter out insufficiently trustworthy 
modules
         * @param string|null $position If not null, only return modules with 
this position
         * @param string $param
+        * @param string $type
         * @return array Array of module names
         */
        public function getModules( $filter = false, $position = null, $param = 
'mModules',
@@ -688,7 +689,7 @@
         * 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 );
@@ -1715,7 +1716,7 @@
         * Add wikitext with a custom Title object
         *
         * @param string $text Wikitext
-        * @param Title $title
+        * @param Title &$title
         * @param bool $linestart Is this the start of a line?
         */
        public function addWikiTextWithTitle( $text, &$title, $linestart = true 
) {
@@ -1726,7 +1727,7 @@
         * Add wikitext with a custom Title object and tidy enabled.
         *
         * @param string $text Wikitext
-        * @param Title $title
+        * @param Title &$title
         * @param bool $linestart Is this the start of a line?
         */
        function addWikiTextTitleTidy( $text, &$title, $linestart = true ) {
@@ -1899,7 +1900,7 @@
        /**
         * Add the output of a QuickTemplate to the output buffer
         *
-        * @param QuickTemplate $template
+        * @param QuickTemplate &$template
         */
        public function addTemplate( &$template ) {
                $this->addHTML( $template->getHTML() );
@@ -1963,7 +1964,7 @@
        }
 
        /**
-        * @param $maxage
+        * @param int $maxage
         * @deprecated since 1.27 Use setCdnMaxage() instead
         */
        public function setSquidMaxage( $maxage ) {
@@ -1998,9 +1999,9 @@
         * TTL is 90% of the age of the object, subject to the min and max.
         *
         * @param string|integer|float|bool|null $mtime Last-Modified timestamp
-        * @param integer $minTTL Mimimum TTL in seconds [default: 1 minute]
-        * @param integer $maxTTL Maximum TTL in seconds [default: 
$wgSquidMaxage]
-        * @return integer TTL in seconds
+        * @param int $minTTL Mimimum TTL in seconds [default: 1 minute]
+        * @param int $maxTTL Maximum TTL in seconds [default: $wgSquidMaxage]
+        * @return int TTL in seconds
         * @since 1.28
         */
        public function adaptCdnTTL( $mtime, $minTTL = 0, $maxTTL = 0 ) {
@@ -3797,7 +3798,7 @@
         * 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/ProtectionForm.php b/includes/ProtectionForm.php
index a68c36f..53608e8 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -616,7 +616,7 @@
        /**
         * Show protection long extracts for this page
         *
-        * @param OutputPage $out
+        * @param OutputPage &$out
         * @access private
         */
        function showLogExtract( &$out ) {
diff --git a/includes/Revision.php b/includes/Revision.php
index 88b138d..944cb83 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -752,7 +752,7 @@
         * This should only be used for proposed revisions that turn out to be 
null edits
         *
         * @since 1.28
-        * @param integer $id User ID
+        * @param int $id User ID
         * @param string $name User name
         */
        public function setUserIdAndName( $id, $name ) {
@@ -1307,7 +1307,7 @@
         * data is compressed, and 'utf-8' if we're saving in UTF-8
         * mode.
         *
-        * @param mixed $text Reference to a text
+        * @param mixed &$text Reference to a text
         * @return string
         */
        public static function compressRevisionText( &$text ) {
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 8d9256b..7a01a65 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -345,7 +345,7 @@
         * @param string $setting ID of the setting name to retrieve
         * @param string $wiki Wiki ID of the wiki in question.
         * @param string $suffix The suffix of the wiki in question.
-        * @param array $var Reference The variable to insert the value into.
+        * @param array &$var Reference The variable to insert the value into.
         * @param array $params List of parameters. $.'key' is replaced by 
$value in all returned data.
         * @param array $wikiTags The tags assigned to the wiki.
         */
diff --git a/includes/StubObject.php b/includes/StubObject.php
index 5208b8f..baf5109 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -86,7 +86,7 @@
         * infinite loop when unstubbing an object or to avoid reference 
parameter
         * breakage.
         *
-        * @param object $obj Object to check.
+        * @param object &$obj Object to check.
         * @return void
         */
        public static function unstub( &$obj ) {
diff --git a/includes/Title.php b/includes/Title.php
index 5decece..9b7e1d2 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1896,6 +1896,8 @@
         * protocol-relative, the URL will be expanded to http://
         *
         * @see self::getLocalURL for the arguments.
+        * @param string $query
+        * @param string|bool $query2
         * @return string The URL
         */
        public function getInternalURL( $query = '', $query2 = false ) {
@@ -1917,6 +1919,8 @@
         * NOTE: Unlike getInternalURL(), the canonical URL includes the 
fragment
         *
         * @see self::getLocalURL for the arguments.
+        * @param string $query
+        * @param string|bool $query2
         * @return string The URL
         * @since 1.18
         */
@@ -3673,6 +3677,7 @@
 
        /**
         * @deprecated since 1.27 use getCdnUrls()
+        * @return array
         */
        public function getSquidURLs() {
                return $this->getCdnUrls();
@@ -3693,7 +3698,7 @@
         * Returns true if ok, or a getUserPermissionsErrors()-like array 
otherwise
         *
         * @deprecated since 1.25, use MovePage's methods instead
-        * @param Title $nt The new title
+        * @param Title &$nt The new title
         * @param bool $auth Whether to check user permissions (uses $wgUser)
         * @param string $reason Is the log summary of the move, used for spam 
checking
         * @return array|bool True on success, getUserPermissionsErrors()-like 
array on failure
@@ -3745,7 +3750,7 @@
         * Move a title to a new location
         *
         * @deprecated since 1.25, use the MovePage class instead
-        * @param Title $nt The new title
+        * @param Title &$nt The new title
         * @param bool $auth Indicates whether $wgUser's permissions
         *  should be checked
         * @param string $reason The reason for the move
diff --git a/includes/api/ApiAuthManagerHelper.php 
b/includes/api/ApiAuthManagerHelper.php
index 3a9fb73..d6b9f76 100644
--- a/includes/api/ApiAuthManagerHelper.php
+++ b/includes/api/ApiAuthManagerHelper.php
@@ -229,8 +229,8 @@
 
        /**
         * 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 @@
        /**
         * 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 500f432..2012e7d 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -668,7 +668,7 @@
 
        /**
         * Set the continuation manager
-        * @param ApiContinuationManager|null
+        * @param ApiContinuationManager|null $manager
         */
        public function setContinuationManager( $manager ) {
                // Main module has setContinuationManager() method overridden
@@ -1432,7 +1432,7 @@
         * Validate the value against the minimum and user/bot maximum limits.
         * Prints usage info on failure.
         * @param string $paramName Parameter name
-        * @param int $value Parameter value
+        * @param int &$value Parameter value
         * @param int|null $min Minimum value
         * @param int|null $max Maximum value for users
         * @param int $botMax Maximum value for sysops/bots
@@ -1599,7 +1599,7 @@
 
        /**
         * Truncate an array to a certain length.
-        * @param array $arr Array to truncate
+        * @param array &$arr Array to truncate
         * @param int $limit Maximum length
         * @return bool True if the array was truncated, false otherwise
         */
diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 72bbe00..7766acd 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -106,7 +106,7 @@
         *
         * @param Page|WikiPage $page Page or WikiPage object to work on
         * @param User $user User doing the action
-        * @param string|null $reason Reason for the deletion. Autogenerated if 
null
+        * @param string|null &$reason Reason for the deletion. Autogenerated 
if null
         * @param array $tags Tags to tag the deletion with
         * @return Status
         */
@@ -142,7 +142,7 @@
         * @param Page $page Object to work on
         * @param User $user User doing the action
         * @param string $oldimage Archive name
-        * @param string $reason Reason for the deletion. Autogenerated if null.
+        * @param string &$reason Reason for the deletion. Autogenerated if 
null.
         * @param bool $suppress Whether to mark all deleted versions as 
restricted
         * @param array $tags Tags to tag the deletion with
         * @return Status
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 4ce0e9f..17b0093 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -184,7 +184,7 @@
        }
 
        /**
-        * @param array $res Result array
+        * @param array &$res Result array
         * @param string $key Result key
         * @param Message[] $msgs
         * @param bool $joinLists
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index f8eaa84..44526e8 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -478,7 +478,7 @@
        /**
         * Add information (title and namespace) about a Title object to a
         * result array
-        * @param array $arr Result array à la ApiResult
+        * @param array &$arr Result array à la ApiResult
         * @param Title $title
         * @param string $prefix Module prefix
         */
diff --git a/includes/api/ApiQueryLogEvents.php 
b/includes/api/ApiQueryLogEvents.php
index df8a11e..3e8bccc 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -242,7 +242,7 @@
        /**
         * @deprecated since 1.25 Use LogFormatter::formatParametersForApi 
instead
         * @param ApiResult $result
-        * @param array $vals
+        * @param array &$vals
         * @param string $params
         * @param string $type
         * @param string $action
diff --git a/includes/content/ContentHandler.php 
b/includes/content/ContentHandler.php
index 8603360..90364f3 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -1134,7 +1134,7 @@
 
        /**
         * Add new field definition to array.
-        * @param SearchIndexField[] $fields
+        * @param SearchIndexField[] &$fields
         * @param SearchEngine       $engine
         * @param string             $name
         * @param int                $type
diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index 14c8182..2b94f3f 100644
--- a/includes/content/JsonContent.php
+++ b/includes/content/JsonContent.php
@@ -22,6 +22,7 @@
 
        /**
         * @param string $text JSON
+        * @param string $modelId
         */
        public function __construct( $text, $modelId = CONTENT_MODEL_JSON ) {
                parent::__construct( $text, $modelId );
@@ -96,7 +97,7 @@
         * @param int $revId
         * @param ParserOptions $options
         * @param bool $generateHtml
-        * @param ParserOutput $output
+        * @param ParserOutput &$output
         */
        protected function fillParserOutput( Title $title, $revId,
                ParserOptions $options, $generateHtml, ParserOutput &$output
diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php
index 7bb4def..5f585bc 100644
--- a/includes/content/TextContent.php
+++ b/includes/content/TextContent.php
@@ -157,7 +157,7 @@
         * changes.
         *
         * @since 1.28
-        * @param $text
+        * @param string $text
         * @return string
         */
        public static function normalizeLineEndings( $text ) {
@@ -233,7 +233,7 @@
         * @param int $revId Revision ID (for {{REVISIONID}})
         * @param ParserOptions $options Parser options
         * @param bool $generateHtml Whether or not to generate HTML
-        * @param ParserOutput $output The output object to fill (reference).
+        * @param ParserOutput &$output The output object to fill (reference).
         */
        protected function fillParserOutput( Title $title, $revId,
                ParserOptions $options, $generateHtml, ParserOutput &$output
diff --git a/includes/diff/DiffFormatter.php b/includes/diff/DiffFormatter.php
index 6231c78..07124c0 100644
--- a/includes/diff/DiffFormatter.php
+++ b/includes/diff/DiffFormatter.php
@@ -125,7 +125,7 @@
         * @param int $xlen
         * @param int $ybeg
         * @param int $ylen
-        * @param array $edits
+        * @param array &$edits
         *
         * @throws MWException If the edit type is not known.
         */
diff --git a/includes/gallery/TraditionalImageGallery.php 
b/includes/gallery/TraditionalImageGallery.php
index a0059ce..7a520bc 100644
--- a/includes/gallery/TraditionalImageGallery.php
+++ b/includes/gallery/TraditionalImageGallery.php
@@ -348,7 +348,7 @@
         *
         * Used by a subclass to insert extra high resolution images.
         * @param MediaTransformOutput $thumb The thumbnail
-        * @param array $imageParameters Array of options
+        * @param array &$imageParameters Array of options
         */
        protected function adjustImageParameters( $thumb, &$imageParameters ) {
        }
diff --git a/includes/import/UploadSourceAdapter.php 
b/includes/import/UploadSourceAdapter.php
index 1f49c8a..ccacbe4 100644
--- a/includes/import/UploadSourceAdapter.php
+++ b/includes/import/UploadSourceAdapter.php
@@ -57,7 +57,7 @@
         * @param string $path
         * @param string $mode
         * @param array $options
-        * @param string $opened_path
+        * @param string &$opened_path
         * @return bool
         */
        function stream_open( $path, $mode, $options, &$opened_path ) {
diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php
index 63258cb..7c89b23 100644
--- a/includes/import/WikiImporter.php
+++ b/includes/import/WikiImporter.php
@@ -428,7 +428,7 @@
 
        /**
         * Alternate per-revision callback, for debugging.
-        * @param WikiRevision $revision
+        * @param WikiRevision &$revision
         */
        public function debugRevisionHandler( &$revision ) {
                $this->debug( "Got revision:" );
diff --git a/includes/libs/ArrayUtils.php b/includes/libs/ArrayUtils.php
index 2156bd7..0413ea0 100644
--- a/includes/libs/ArrayUtils.php
+++ b/includes/libs/ArrayUtils.php
@@ -39,7 +39,7 @@
         * justification for breaking compatibility with installations
         * compiled with ./configure --disable-hash.
         *
-        * @param array $array Array to sort
+        * @param array &$array Array to sort
         * @param string $key
         * @param string $separator A separator used to delimit the array 
elements and the
         *     key. This can be chosen to provide backwards compatibility with
diff --git a/includes/libs/MultiHttpClient.php 
b/includes/libs/MultiHttpClient.php
index 9d6b734..6c48cee 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -275,7 +275,7 @@
        }
 
        /**
-        * @param array $req HTTP request map
+        * @param array &$req HTTP request map
         * @param array $opts
         *   - connTimeout    : default connection timeout
         *   - reqTimeout     : default request timeout
@@ -435,7 +435,7 @@
        /**
         * Register a logger
         *
-        * @param LoggerInterface
+        * @param LoggerInterface $logger
         */
        public function setLogger( LoggerInterface $logger ) {
                $this->logger = $logger;
diff --git a/includes/libs/filebackend/SwiftFileBackend.php 
b/includes/libs/filebackend/SwiftFileBackend.php
index 044e976..eb72edc 100644
--- a/includes/libs/filebackend/SwiftFileBackend.php
+++ b/includes/libs/filebackend/SwiftFileBackend.php
@@ -69,7 +69,7 @@
 
        /**
         * @see FileBackendStore::__construct()
-        * Additional $config params include:
+        * @param array $config Params include:
         *   - swiftAuthUrl       : Swift authentication server URL
         *   - swiftUser          : Swift user used by MediaWiki 
(account:username)
         *   - swiftKey           : Swift authentication key for the above user
@@ -828,7 +828,7 @@
         *
         * @param string $fullCont Resolved container name
         * @param string $dir Resolved storage directory with no trailing slash
-        * @param string|null $after Resolved container relative path to list 
items after
+        * @param string|null &$after Resolved container relative path to list 
items after
         * @param int $limit Max number of items to list
         * @param array $params Parameters for getDirectoryList()
         * @return array List of container relative resolved paths of 
directories directly under $dir
@@ -908,7 +908,7 @@
         *
         * @param string $fullCont Resolved container name
         * @param string $dir Resolved storage directory with no trailing slash
-        * @param string|null $after Resolved container relative path of file 
to list items after
+        * @param string|null &$after Resolved container relative path of file 
to list items after
         * @param int $limit Max number of items to list
         * @param array $params Parameters for getDirectoryList()
         * @return array List of resolved container relative paths of files 
under $dir
@@ -1888,7 +1888,7 @@
         *
         * @param string $container Resolved container name
         * @param string $dir Resolved path relative to container
-        * @param string $after
+        * @param string &$after
         * @param int $limit
         * @param array $params
         * @return Traversable|array
diff --git a/includes/libs/filebackend/fileop/FileOp.php 
b/includes/libs/filebackend/fileop/FileOp.php
index 30578fa..40af7ac 100644
--- a/includes/libs/filebackend/fileop/FileOp.php
+++ b/includes/libs/filebackend/fileop/FileOp.php
@@ -247,7 +247,7 @@
         * This must update $predicates for each path that the op can change
         * except when a failing StatusValue object is returned.
         *
-        * @param array $predicates
+        * @param array &$predicates
         * @return StatusValue
         */
        final public function precheck( array &$predicates ) {
@@ -264,7 +264,7 @@
        }
 
        /**
-        * @param array $predicates
+        * @param array &$predicates
         * @return StatusValue
         */
        protected function doPrecheck( array &$predicates ) {
diff --git a/includes/libs/lockmanager/ScopedLock.php 
b/includes/libs/lockmanager/ScopedLock.php
index e10606a..2ad8ac8 100644
--- a/includes/libs/lockmanager/ScopedLock.php
+++ b/includes/libs/lockmanager/ScopedLock.php
@@ -85,7 +85,7 @@
         * This is useful for early release of locks before function scope is 
destroyed.
         * This is the same as setting the lock object to null.
         *
-        * @param ScopedLock $lock
+        * @param ScopedLock &$lock
         * @since 1.21
         */
        public static function release( ScopedLock &$lock = null ) {
diff --git a/includes/libs/objectcache/BagOStuff.php 
b/includes/libs/objectcache/BagOStuff.php
index 7cd678b..5e94dd2 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -142,7 +142,7 @@
         * @param string $key
         * @param int $ttl Time-to-live (seconds)
         * @param callable $callback Callback that derives the new value
-        * @param integer $flags Bitfield of BagOStuff::READ_* constants 
[optional]
+        * @param int $flags Bitfield of BagOStuff::READ_* constants [optional]
         * @return mixed The cached value if found or the result of $callback 
otherwise
         * @since 1.27
         */
@@ -172,8 +172,8 @@
         * higher tiers using standard TTLs.
         *
         * @param string $key
-        * @param integer $flags Bitfield of BagOStuff::READ_* constants 
[optional]
-        * @param integer $oldFlags [unused]
+        * @param int $flags Bitfield of BagOStuff::READ_* constants [optional]
+        * @param int $oldFlags [unused]
         * @return mixed Returns false on failure and if the item does not exist
         */
        public function get( $key, $flags = 0, $oldFlags = null ) {
@@ -220,7 +220,7 @@
 
        /**
         * @param string $key
-        * @param integer $flags Bitfield of BagOStuff::READ_* constants 
[optional]
+        * @param int $flags Bitfield of BagOStuff::READ_* constants [optional]
         * @return mixed Returns false on failure and if the item does not exist
         */
        abstract protected function doGet( $key, $flags = 0 );
@@ -229,8 +229,8 @@
         * @note: This method is only needed if merge() uses mergeViaCas()
         *
         * @param string $key
-        * @param mixed $casToken
-        * @param integer $flags Bitfield of BagOStuff::READ_* constants 
[optional]
+        * @param mixed &$casToken
+        * @param int $flags Bitfield of BagOStuff::READ_* constants [optional]
         * @return mixed Returns false on failure and if the item does not exist
         * @throws Exception
         */
@@ -503,7 +503,7 @@
        /**
         * Get an associative array containing the item for each of the keys 
that have items.
         * @param array $keys List of strings
-        * @param integer $flags Bitfield; supports READ_LATEST [optional]
+        * @param int $flags Bitfield; supports READ_LATEST [optional]
         * @return array
         */
        public function getMulti( array $keys, $flags = 0 ) {
@@ -747,7 +747,7 @@
         * Make a global cache key.
         *
         * @since 1.27
-        * @param string ... Key component (variadic)
+        * @param string $keys,... Key component (variadic)
         * @return string
         */
        public function makeGlobalKey() {
@@ -758,7 +758,7 @@
         * Make a cache key, scoped to this instance's keyspace.
         *
         * @since 1.27
-        * @param string ... Key component (variadic)
+        * @param string $keys,... Key component (variadic)
         * @return string
         */
        public function makeKey() {
@@ -766,8 +766,8 @@
        }
 
        /**
-        * @param integer $flag ATTR_* class constant
-        * @return integer QOS_* class constant
+        * @param int $flag ATTR_* class constant
+        * @return int QOS_* class constant
         * @since 1.28
         */
        public function getQoS( $flag ) {
@@ -778,7 +778,7 @@
         * Merge the flag maps of one or more BagOStuff objects into a "lowest 
common denominator" map
         *
         * @param BagOStuff[] $bags
-        * @return integer[] Resulting flag map (class ATTR_* constant => class 
QOS_* constant)
+        * @return int[] Resulting flag map (class ATTR_* constant => class 
QOS_* constant)
         */
        protected function mergeFlagMaps( array $bags ) {
                $map = [];
diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index ff7e91a..492ee0b 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -240,7 +240,7 @@
         * That method has cache slam avoiding features for hot/expensive keys.
         *
         * @param string $key Cache key
-        * @param mixed $curTTL Approximate TTL left on the key if 
present/tombstoned [returned]
+        * @param mixed &$curTTL Approximate TTL left on the key if 
present/tombstoned [returned]
         * @param array $checkKeys List of "check" keys
         * @param float &$asOf UNIX timestamp of cached value; null on failure 
[returned]
         * @return mixed Value of cache key or false on failure
@@ -261,7 +261,7 @@
         * @see WANObjectCache::get()
         *
         * @param array $keys List of cache keys
-        * @param array $curTTLs Map of (key => approximate TTL left) for 
existing keys [returned]
+        * @param array &$curTTLs Map of (key => approximate TTL left) for 
existing keys [returned]
         * @param array $checkKeys List of check keys to apply to all $keys. 
May also apply "check"
         *  keys to specific cache keys only by using cache keys as keys in the 
$checkKeys array.
         * @param float[] &$asOfs Map of (key =>  UNIX timestamp of cached 
value; null on failure)
@@ -404,7 +404,7 @@
         *
         * @param string $key Cache key
         * @param mixed $value
-        * @param integer $ttl Seconds to live. Special values are:
+        * @param int $ttl Seconds to live. Special values are:
         *   - WANObjectCache::TTL_INDEFINITE: Cache forever
         * @param array $opts Options map:
         *   - lag : Seconds of replica DB lag. Typically, this is either the 
replica DB lag
@@ -537,7 +537,7 @@
         * idempotence, the $ttl should not vary for different delete() calls 
on the same key.
         *
         * @param string $key Cache key
-        * @param integer $ttl Tombstone TTL; Default: 
WANObjectCache::HOLDOFF_TTL
+        * @param int $ttl Tombstone TTL; Default: WANObjectCache::HOLDOFF_TTL
         * @return bool True if the item was purged or not found, false on 
failure
         */
        final public function delete( $key, $ttl = self::HOLDOFF_TTL ) {
@@ -797,7 +797,7 @@
         * @see WANObjectCache::set()
         *
         * @param string $key Cache key
-        * @param integer $ttl Seconds to live for key updates. Special values 
are:
+        * @param int $ttl Seconds to live for key updates. Special values are:
         *   - WANObjectCache::TTL_INDEFINITE: Cache forever
         *   - WANObjectCache::TTL_UNCACHEABLE: Do not cache at all
         * @param callable $callback Value generation function
@@ -929,7 +929,7 @@
         * @see WANObjectCache::getWithSetCallback()
         *
         * @param string $key
-        * @param integer $ttl
+        * @param int $ttl
         * @param callback $callback
         * @param array $opts Options map for getWithSetCallback()
         * @param float &$asOf Cache generation timestamp of returned value 
[returned]
@@ -1098,7 +1098,7 @@
         * @endcode
         *
         * @param ArrayIterator $keyedIds Result of 
WANObjectCache::makeMultiKeys()
-        * @param integer $ttl Seconds to live for key updates
+        * @param int $ttl Seconds to live for key updates
         * @param callable $callback Callback the yields entity regeneration 
callbacks
         * @param array $opts Options map
         * @return array Map of (cache key => value) in the same order as 
$keyedIds
@@ -1184,7 +1184,7 @@
         * @endcode
         *
         * @param ArrayIterator $keyedIds Result of 
WANObjectCache::makeMultiKeys()
-        * @param integer $ttl Seconds to live for key updates
+        * @param int $ttl Seconds to live for key updates
         * @param callable $callback Callback the yields entity regeneration 
callbacks
         * @param array $opts Options map
         * @return array Map of (cache key => value) in the same order as 
$keyedIds
@@ -1393,8 +1393,8 @@
        }
 
        /**
-        * @param integer $flag ATTR_* class constant
-        * @return integer QOS_* class constant
+        * @param int $flag ATTR_* class constant
+        * @return int QOS_* class constant
         * @since 1.28
         */
        public function getQoS( $flag ) {
@@ -1417,11 +1417,11 @@
         *     $ttl = $cache->adaptiveTTL( $mtime, $cache::TTL_DAY );
         * @endcode
         *
-        * @param integer|float $mtime UNIX timestamp
-        * @param integer $maxTTL Maximum TTL (seconds)
-        * @param integer $minTTL Minimum TTL (seconds); Default: 30
+        * @param int|float $mtime UNIX timestamp
+        * @param int $maxTTL Maximum TTL (seconds)
+        * @param int $minTTL Minimum TTL (seconds); Default: 30
         * @param float $factor Value in the range (0,1); Default: .2
-        * @return integer Adaptive TTL
+        * @return int Adaptive TTL
         * @since 1.28
         */
        public function adaptiveTTL( $mtime, $maxTTL, $minTTL = 30, $factor = 
.2 ) {
@@ -1439,7 +1439,7 @@
        }
 
        /**
-        * @return integer Number of warmup key cache misses last round
+        * @return int Number of warmup key cache misses last round
         * @since 1.30
         */
        public function getWarmupKeyMisses() {
@@ -1452,8 +1452,8 @@
         * This must set the key to "PURGED:<UNIX timestamp>:<holdoff>"
         *
         * @param string $key Cache key
-        * @param integer $ttl How long to keep the tombstone [seconds]
-        * @param integer $holdoff HOLDOFF_* constant controlling how long to 
ignore sets for this key
+        * @param int $ttl How long to keep the tombstone [seconds]
+        * @param int $holdoff HOLDOFF_* constant controlling how long to 
ignore sets for this key
         * @return bool Success
         */
        protected function relayPurge( $key, $ttl, $holdoff ) {
@@ -1540,8 +1540,8 @@
         * and get hits too. Similar to worthRefreshExpiring(), randomization 
is used.
         *
         * @param float $asOf UNIX timestamp of the value
-        * @param integer $ageNew Age of key when this might recommend 
refreshing (seconds)
-        * @param integer $timeTillRefresh Age of key when it should be 
refreshed if popular (seconds)
+        * @param int $ageNew Age of key when this might recommend refreshing 
(seconds)
+        * @param int $timeTillRefresh Age of key when it should be refreshed 
if popular (seconds)
         * @param float $now The current UNIX timestamp
         * @return bool
         */
@@ -1590,7 +1590,7 @@
         * Do not use this method outside WANObjectCache
         *
         * @param mixed $value
-        * @param integer $ttl [0=forever]
+        * @param int $ttl [0=forever]
         * @param float $now Unix Current timestamp just before calling set()
         * @return array
         */
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php 
b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index 8d19bc1..991e0c6 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -989,8 +989,8 @@
        }
 
        /**
-        * @param string $sql
-        * @param string $newLine
+        * @param string &$sql
+        * @param string &$newLine
         * @return bool
         */
        public function streamStatementEnd( &$sql, &$newLine ) {
diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php 
b/includes/libs/rdbms/lbfactory/ILBFactory.php
index 6e328f4..ad56ae3 100644
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -40,7 +40,7 @@
         *
         * 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]
@@ -138,7 +138,7 @@
 
        /**
         * Prepare all tracked load balancers for shutdown
-        * @param integer $mode One of the class SHUTDOWN_* constants
+        * @param int $mode One of the class SHUTDOWN_* constants
         * @param callable|null $workCallback Work to mask ChronologyProtector 
writes
         */
        public function shutdown(
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php
index 1f8489f..cb07fd5 100644
--- a/includes/mail/UserMailer.php
+++ b/includes/mail/UserMailer.php
@@ -102,7 +102,7 @@
         * @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 @@
         * @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/page/Article.php b/includes/page/Article.php
index 33f7d47..f52cd8d 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1920,7 +1920,7 @@
 
        /**
         * Check if the page can be cached
-        * @param integer $mode One of the HTMLFileCache::MODE_* constants 
(since 1.28)
+        * @param int $mode One of the HTMLFileCache::MODE_* constants (since 
1.28)
         * @return bool
         */
        public function isFileCacheable( $mode = HTMLFileCache::MODE_NORMAL ) {
@@ -2580,7 +2580,7 @@
        /**
         * @param array $limit
         * @param array $expiry
-        * @param bool $cascade
+        * @param bool &$cascade
         * @param string $reason
         * @param User $user
         * @return Status
@@ -2594,7 +2594,7 @@
        /**
         * @param array $limit
         * @param string $reason
-        * @param int $cascade
+        * @param int &$cascade
         * @param array $expiry
         * @return bool
         */
@@ -2615,7 +2615,7 @@
         * @param bool $suppress
         * @param int $u1 Unused
         * @param bool $u2 Unused
-        * @param string $error
+        * @param string &$error
         * @return bool
         */
        public function doDeleteArticle(
@@ -2629,7 +2629,7 @@
         * @param string $summary
         * @param string $token
         * @param bool $bot
-        * @param array $resultDetails
+        * @param array &$resultDetails
         * @param User|null $user
         * @return array
         */
@@ -2642,7 +2642,7 @@
         * @param string $fromP
         * @param string $summary
         * @param bool $bot
-        * @param array $resultDetails
+        * @param array &$resultDetails
         * @param User|null $guser
         * @return array
         */
@@ -2652,7 +2652,7 @@
        }
 
        /**
-        * @param bool $hasHistory
+        * @param bool &$hasHistory
         * @return mixed
         */
        public function generateReason( &$hasHistory ) {
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index af906fb..3040b44 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1638,7 +1638,7 @@
 
        /**
         * @param Content $content Pre-save transform content
-        * @param integer $flags
+        * @param int $flags
         * @param User $user
         * @param string $summary
         * @param array $meta
@@ -1812,7 +1812,7 @@
 
        /**
         * @param Content $content Pre-save transform content
-        * @param integer $flags
+        * @param int $flags
         * @param User $user
         * @param string $summary
         * @param array $meta
@@ -2919,7 +2919,7 @@
        /**
         * Lock the page row for this title+id and return page_latest (or 0)
         *
-        * @return integer Returns 0 if no row was found with this title+id
+        * @return int Returns 0 if no row was found with this title+id
         * @since 1.27
         */
        public function lockAndGetLatest() {
@@ -3001,7 +3001,7 @@
         * @param string $token Rollback token.
         * @param bool $bot If true, mark all reverted edits as bot.
         *
-        * @param array $resultDetails Array contains result-specific array of 
additional values
+        * @param array &$resultDetails Array contains result-specific array of 
additional values
         *    'alreadyrolled' : 'current' (rev)
         *    success        : 'summary' (str), 'current' (rev), 'target' (rev)
         *
@@ -3053,7 +3053,7 @@
         * @param string $summary Custom summary. Set to default summary if 
empty.
         * @param bool $bot If true, mark all reverted edits as bot.
         *
-        * @param array $resultDetails Contains result-specific array of 
additional values
+        * @param array &$resultDetails Contains result-specific array of 
additional values
         * @param User $guser The user performing the rollback
         * @param array|null $tags Change tags to apply to the rollback
         * Callers are responsible for permission checks
@@ -3414,7 +3414,7 @@
         *
         * @param array $added The names of categories that were added
         * @param array $deleted The names of categories that were deleted
-        * @param integer $id Page ID (this should be the original deleted page 
ID)
+        * @param int $id Page ID (this should be the original deleted page ID)
         */
        public function updateCategoryCounts( array $added, array $deleted, $id 
= 0 ) {
                $id = $id ?: $this->getId();
@@ -3633,7 +3633,7 @@
                return $this->getTitle()->getCanonicalURL();
        }
 
-       /*
+       /**
         * @param WANObjectCache $cache
         * @return string[]
         * @since 1.28
diff --git a/includes/parser/LinkHolderArray.php 
b/includes/parser/LinkHolderArray.php
index d2a0a1a..bc5182c 100644
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -264,7 +264,7 @@
        /**
         * Replace <!--LINK--> link placeholders with actual links, in the 
buffer
         *
-        * @param string $text
+        * @param string &$text
         */
        public function replace( &$text ) {
                $this->replaceInternal( $text );
@@ -273,7 +273,7 @@
 
        /**
         * Replace internal links
-        * @param string $text
+        * @param string &$text
         */
        protected function replaceInternal( &$text ) {
                if ( !$this->internals ) {
@@ -416,7 +416,7 @@
 
        /**
         * Replace interwiki links
-        * @param string $text
+        * @param string &$text
         */
        protected function replaceInterwiki( &$text ) {
                if ( empty( $this->interwikis ) ) {
@@ -444,7 +444,7 @@
 
        /**
         * Modify $this->internals and $colours according to language variant 
linking rules
-        * @param array $colours
+        * @param array &$colours
         */
        protected function doVariants( &$colours ) {
                global $wgContLang;
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 88439db..74ffc88 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -972,7 +972,7 @@
         *
         * @param array $elements List of element names. Comments are always 
extracted.
         * @param string $text Source text string.
-        * @param array $matches Out parameter, Array: extracted tags
+        * @param array &$matches Out parameter, Array: extracted tags
         * @param string|null $uniq_prefix
         * @return string Stripped text
         * @since 1.26 The uniq_prefix argument is deprecated.
@@ -2103,7 +2103,7 @@
 
        /**
         * Process [[ ]] wikilinks (RIL)
-        * @param string $s
+        * @param string &$s
         * @throws MWException
         * @return LinkHolderArray
         *
@@ -4536,7 +4536,7 @@
         * Do not reuse this parser instance after calling getUserSig(),
         * as it may have changed if it's the $wgParser.
         *
-        * @param User $user
+        * @param User &$user
         * @param string|bool $nickname Nickname to use or false to use user's 
default nickname
         * @param bool|null $fancySig whether the nicknname is the complete 
signature
         *    or null to use default value
@@ -4897,7 +4897,7 @@
         * Replace "<!--LINK-->" link placeholders with actual links, in the 
buffer
         * Placeholders created in Linker::link()
         *
-        * @param string $text
+        * @param string &$text
         * @param int $options
         */
        public function replaceLinkHolders( &$text, $options = 0 ) {
@@ -5406,7 +5406,7 @@
         * Callback from the Sanitizer for expanding items found in HTML 
attribute
         * values, so they can be safely tested and escaped.
         *
-        * @param string $text
+        * @param string &$text
         * @param bool|PPFrame $frame
         * @return string
         */
diff --git a/includes/revisiondelete/RevDelList.php 
b/includes/revisiondelete/RevDelList.php
index 64a6aec..50253ee 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -402,7 +402,7 @@
        /**
         * A hook for setVisibility(): do any necessary updates post-commit.
         * STUB
-        * @param array [id => ['oldBits' => $oldBits, 'newBits' => $newBits], 
... ]
+        * @param $visibilityChangeMap array [id => ['oldBits' => $oldBits, 
'newBits' => $newBits], ... ]
         * @return Status
         */
        public function doPostCommitUpdates( array $visibilityChangeMap ) {
diff --git a/includes/revisiondelete/RevisionDeleter.php 
b/includes/revisiondelete/RevisionDeleter.php
index b834c15..76fa590 100644
--- a/includes/revisiondelete/RevisionDeleter.php
+++ b/includes/revisiondelete/RevisionDeleter.php
@@ -98,7 +98,7 @@
         * @param int $field The bitmask describing the single option.
         * @param int $diff The xor of the old and new bitfields.
         * @param int $new The new bitfield
-        * @param array $arr The array to update.
+        * @param array &$arr The array to update.
         */
        protected static function checkItem( $desc, $field, $diff, $new, &$arr 
) {
                if ( $diff & $field ) {
@@ -234,7 +234,7 @@
         * @since 1.22
         * @param array $bitPars ExtractBitParams() params
         * @param int $oldfield Current bitfield
-        * @return integer
+        * @return int
         */
        public static function extractBitfield( array $bitPars, $oldfield ) {
                // Build the actual new rev_deleted bitfield
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 849362a..e1d0034 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -449,7 +449,7 @@
         * "<body>" tag, skins can override it if they have a need to add in any
         * body attributes or classes of their own.
         * @param OutputPage $out
-        * @param array $bodyAttrs
+        * @param array &$bodyAttrs
         */
        function addToBodyAttributes( $out, &$bodyAttrs ) {
                // does nothing by default
@@ -1215,7 +1215,7 @@
        /**
         * make sure we have some title to operate on
         *
-        * @param Title $title
+        * @param Title &$title
         * @param string $name
         */
        static function checkTitle( &$title, $name ) {
@@ -1286,7 +1286,7 @@
         *
         * This is just a wrapper around addToSidebarPlain() for backwards 
compatibility
         *
-        * @param array $bar
+        * @param array &$bar
         * @param string $message
         */
        public function addToSidebar( &$bar, $message ) {
@@ -1296,7 +1296,7 @@
        /**
         * Add content from plain text
         * @since 1.17
-        * @param array $bar
+        * @param array &$bar
         * @param string $text
         * @return array
         */

-- 
To view, visit https://gerrit.wikimedia.org/r/371215
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81e68310abcbc59964b22e0e74842d509f6b1fb9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to