Merge "Fixup parameter type hints"

diff --combined includes/WikiPage.php
index 048dd68,b901db7..4c2691b
--- 1/includes/WikiPage.php
--- 2/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@@ -541,6 -541,7 +541,7 @@@ class WikiPage implements Page, IDBAcce
                $db = wfGetDB( DB_SLAVE );
                $revSelectFields = Revision::selectFields();
  
+               $row = null;
                while ( $continue ) {
                        $row = $db->selectRow(
                                array( 'page', 'revision' ),
@@@ -1023,8 -1024,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 +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 +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 +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 +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 );
        }
  
        /**
@@@ -2347,14 -2352,6 +2352,14 @@@
                                }
                        }
  
 +                      // Clear out legacy restriction fields
 +                      $dbw->update(
 +                              'page',
 +                              array( 'page_restrictions' => '' ),
 +                              array( 'page_id' => $id ),
 +                              __METHOD__
 +                      );
 +
                        wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $nullRevision, $latest, $user ) );
                        wfRunHooks( 'ArticleProtectComplete', array( &$this, &$user, $limit, $reason ) );
                } else { // Protection of non-existing page (also known as "title protection")
@@@ -3353,7 -3350,7 +3358,7 @@@
        public function viewUpdates() {
                wfDeprecated( __METHOD__, '1.18' );
                global $wgUser;
-               return $this->doViewUpdates( $wgUser );
+               $this->doViewUpdates( $wgUser );
        }
  
        /**
@@@ -3438,7 -3435,7 +3443,7 @@@ class PoolWorkArticleView extends PoolC
        /**
         * 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
@@@ -3518,9 -3515,6 +3523,9 @@@
                        return false;
                }
  
 +              // Reduce effects of race conditions for slow parses (bug 46014)
 +              $cacheTime = wfTimestampNow();
 +
                $time = - microtime( true );
                $this->parserOutput = $content->getParserOutput( $this->page->getTitle(), $this->revid, $this->parserOptions );
                $time += microtime( true );
@@@ -3532,8 -3526,7 +3537,8 @@@
                }
  
                if ( $this->cacheable && $this->parserOutput->isCacheable() ) {
 -                      ParserCache::singleton()->save( $this->parserOutput, $this->page, $this->parserOptions );
 +                      ParserCache::singleton()->save(
 +                              $this->parserOutput, $this->page, $this->parserOptions, $cacheTime );
                }
  
                // Make sure file cache is not used on uncacheable content.