Merge "Improve some parameter docs"

diff --combined includes/libs/virtualrest/ParsoidVirtualRESTService.php
index b03a647,64d1a82..37a967f
--- 1/includes/libs/virtualrest/ParsoidVirtualRESTService.php
--- 2/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@@ -58,14 -58,15 +58,14 @@@ class ParsoidVirtualRESTService extend
                        'url' => 'http://localhost:8000/',
                        'prefix' => 'localhost',
                        'domain' => 'localhost',
 +                      'timeout' => null,
                        'forwardCookies' => false,
                        'HTTPProxy' => null,
                ], $params );
                // Ensure that the url parameter has a trailing slash.
 -              $mparams['url'] = preg_replace(
 -                      '#/?$#',
 -                      '/',
 -                      $mparams['url']
 -              );
 +              if ( substr( $mparams['url'], -1 ) !== '/' ) {
 +                      $mparams['url'] .= '/';
 +              }
                // Ensure the correct domain format: strip protocol, port,
                // and trailing slash if present.  This lets us use
                // $wgCanonicalServer as a default value, which is very convenient.
@@@ -146,6 -147,10 +146,10 @@@
         * Visual Editor "pretends" the V1 API is like.  A previous version of
         * ParsoidVirtualRESTService translated these to the "real" Parsoid v1
         * API.  We now translate these to the "real" Parsoid v3 API.
+        * @param array $req
+        * @param Closure $idGeneratorFunc
+        * @return array
+        * @throws Exception
         */
        public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
                $parts = explode( '/', $req['url'] );

diff --combined includes/page/WikiPage.php
index 312edbd,9491902..6fc36f6
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -213,6 -213,7 +213,7 @@@ class WikiPage implements Page, IDBAcce
         * @todo Move this UI stuff somewhere else
         *
         * @see ContentHandler::getActionOverrides
+        * @return array
         */
        public function getActionOverrides() {
                return $this->getContentHandler()->getActionOverrides();
@@@ -1070,8 -1071,7 +1071,8 @@@
                }
  
                if ( $useParserCache ) {
 -                      $parserOutput = ParserCache::singleton()->get( $this, $parserOptions );
 +                      $parserOutput = MediaWikiServices::getInstance()->getParserCache()
 +                              ->get( $this, $parserOptions );
                        if ( $parserOutput !== false ) {
                                return $parserOutput;
                        }
@@@ -2163,7 -2163,7 +2164,7 @@@
  
                // Save it to the parser cache.
                // Make sure the cache time matches page_touched to avoid double parsing.
 -              ParserCache::singleton()->save(
 +              MediaWikiServices::getInstance()->getParserCache()->save(
                        $editInfo->output, $this, $editInfo->popts,
                        $revision->getTimestamp(), $editInfo->revid
                );
@@@ -2733,6 -2733,7 +2734,7 @@@
         * @param array|string &$error Array of errors to append to
         * @param User $user The deleting user
         * @param array $tags Tags to apply to the deletion action
+        * @param string $logsubtype
         * @return Status Status object; if successful, $status->value is the log_id of the
         *   deletion log entry. If the page couldn't be deleted because it wasn't
         *   found, $status is a non-fatal 'cannotdelete' error