Merge "Article: Fix reference to view() in documentation comment"

diff --combined includes/page/Article.php
index 9d651f4,5e51e5c..6a42d58
--- 1/includes/page/Article.php
--- 2/includes/page/Article.php
+++ b/includes/page/Article.php
@@@ -355,7 -355,7 +355,7 @@@ class Article implements Page 
                                if ( $this->mRevision !== null ) {
                                        // Revision title doesn't match the page title given?
                                        if ( $this->mPage->getId() != $this->mRevision->getPage() ) {
 -                                              $function = get_class( $this->mPage ). '::newFromID';
 +                                              $function = get_class( $this->mPage ) . '::newFromID';
                                                $this->mPage = $function( $this->mRevision->getPage() );
                                        }
                                }
@@@ -817,7 -817,6 +817,7 @@@
                // Note that the ArticleViewHeader hook is allowed to set $outputDone to a
                // ParserOutput instance.
                $pOutput = ( $outputDone instanceof ParserOutput )
 +                      // phpcs:ignore MediaWiki.Usage.NestedInlineTernary.UnparenthesizedTernary -- FIXME T203805
                        ? $outputDone // object fetched by hook
                        : $this->mParserOutput ?: null; // ParserOutput or null, avoid false
  
@@@ -2156,7 -2155,7 +2156,7 @@@
  
        /**
         * Lightweight method to get the parser output for a page, checking the parser cache
-        * and so on. Doesn't consider most of the stuff that WikiPage::view is forced to
+        * and so on. Doesn't consider most of the stuff that Article::view() is forced to
         * consider, so it's not appropriate to use there.
         *
         * @since 1.16 (r52326) for LiquidThreads
@@@ -2305,13 -2304,8 +2305,13 @@@
         * Call to WikiPage function for backwards compatibility.
         * @see WikiPage::doDeleteUpdates
         */
 -      public function doDeleteUpdates( $id, Content $content = null ) {
 -              return $this->mPage->doDeleteUpdates( $id, $content );
 +      public function doDeleteUpdates(
 +              $id,
 +              Content $content = null,
 +              $revision = null,
 +              User $user = null
 +      ) {
 +              $this->mPage->doDeleteUpdates( $id, $content, $revision, $user );
        }
  
        /**