jenkins-bot has submitted this change and it was merged.

Change subject: Fixup parameter type hints
......................................................................


Fixup parameter type hints

Remove returns where return is void

Change-Id: I19e911695a545745954cff1fd8372bb4ce35e166
---
M includes/WikiPage.php
1 file changed, 13 insertions(+), 8 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index bfa9956..b901db7 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -541,6 +541,7 @@
                $db = wfGetDB( DB_SLAVE );
                $revSelectFields = Revision::selectFields();
 
+               $row = null;
                while ( $continue ) {
                        $row = $db->selectRow(
                                array( 'page', 'revision' ),
@@ -1023,8 +1024,8 @@
 
        /**
         * Get the last N authors
-        * @param $num Integer: number of revisions to get
-        * @param string $revLatest the latest rev_id, selected from the master 
(optional)
+        * @param int $num Number of revisions to get
+        * @param int|string $revLatest the latest rev_id, selected from the 
master (optional)
         * @return array Array of authors, duplicates not removed
         */
        public function getLastNAuthors( $num, $revLatest = 0 ) {
@@ -1095,8 +1096,8 @@
         * The parser cache will be used if possible.
         *
         * @since 1.19
-        * @param $parserOptions ParserOptions to use for the parse operation
-        * @param $oldid Revision ID to get the text from, passing null or 0 
will
+        * @param ParserOptions $parserOptions ParserOptions to use for the 
parse operation
+        * @param null|int $oldid Revision ID to get the text from, passing 
null or 0 will
         *               get the current revision (default value)
         *
         * @return ParserOutput or false if the revision was not found
@@ -1622,7 +1623,7 @@
         * edit-already-exists error will be returned. These two conditions are 
also possible with
         * auto-detection due to MediaWiki's performance-optimised locking 
strategy.
         *
-        * @param bool|\the $baseRevId the revision ID this edit was based off, 
if any
+        * @param bool|int $baseRevId the revision ID this edit was based off, 
if any
         * @param $user User the user doing the edit
         * @param $serialisation_format String: format for storing the content 
in the database
         *
@@ -1710,6 +1711,10 @@
 
                $editInfo = $this->prepareContentForEdit( $content, null, 
$user, $serialisation_format );
                $serialized = $editInfo->pst;
+
+               /**
+                * @var Content $content
+                */
                $content = $editInfo->pstContent;
                $newsize = $content->getSize();
 
@@ -2174,7 +2179,7 @@
                ContentHandler::deprecated( __METHOD__, "1.21" );
 
                $content = ContentHandler::makeContent( $text, 
$this->getTitle() );
-               return $this->doQuickEditContent( $content, $user, $comment, 
$minor );
+               $this->doQuickEditContent( $content, $user, $comment, $minor );
        }
 
        /**
@@ -3345,7 +3350,7 @@
        public function viewUpdates() {
                wfDeprecated( __METHOD__, '1.18' );
                global $wgUser;
-               return $this->doViewUpdates( $wgUser );
+               $this->doViewUpdates( $wgUser );
        }
 
        /**
@@ -3430,7 +3435,7 @@
        /**
         * Constructor
         *
-        * @param $page Page
+        * @param $page Page|WikiPage
         * @param $revid Integer: ID of the revision being parsed
         * @param $useParserCache Boolean: whether to use the parser cache
         * @param $parserOptions parserOptions to use for the parse operation

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I19e911695a545745954cff1fd8372bb4ce35e166
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to