Merge "WikiPage: Hard deprecate second arg of prepareContentForEdit() as an int"

diff --combined includes/page/WikiPage.php
index c04eb0a,7f923f8..d0a04c0
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -213,7 -213,6 +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();
@@@ -983,12 -982,18 +983,12 @@@
  
                $dbr = wfGetDB( DB_REPLICA );
  
 -              if ( $dbr->implicitGroupby() ) {
 -                      $realNameField = 'user_real_name';
 -              } else {
 -                      $realNameField = 'MIN(user_real_name) AS user_real_name';
 -              }
 -
                $tables = [ 'revision', 'user' ];
  
                $fields = [
                        'user_id' => 'rev_user',
                        'user_name' => 'rev_user_text',
 -                      $realNameField,
 +                      'user_real_name' => 'MIN(user_real_name)',
                        'timestamp' => 'MAX(rev_timestamp)',
                ];
  
@@@ -1915,10 -1920,10 +1915,10 @@@
                                        $wikiPage = $this;
                                        // Trigger post-create hook
                                        $params = [ &$wikiPage, &$user, $content, $summary,
 -                                              $flags & EDIT_MINOR, null, null, &$flags, $revision ];
 +                                                              $flags & EDIT_MINOR, null, null, &$flags, $revision ];
                                        Hooks::run( 'PageContentInsertComplete', $params );
                                        // Trigger post-save hook
 -                                      $params = array_merge( $params, [ &$status, $meta['baseRevId'] ] );
 +                                      $params = array_merge( $params, [ &$status, $meta['baseRevId'], 0 ] );
                                        Hooks::run( 'PageContentSaveComplete', $params );
                                }
                        ),
@@@ -1984,6 -1989,7 +1984,7 @@@
                        // This code path is deprecated, and nothing is known to
                        // use it, so performance here shouldn't be a worry.
                        if ( $revid !== null ) {
+                               wfDeprecated( __METHOD__ . ' with $revision = revision ID', '1.25' );
                                $revision = Revision::newFromId( $revid, Revision::READ_LATEST );
                        } else {
                                $revision = null;
@@@ -2728,7 -2734,6 +2729,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