Merge "Provide backwards compatibility for RevisionInsertComplete hook."

diff --combined includes/Revision.php
index 213abbe,41e889b..b9a03f5
--- 1/includes/Revision.php
--- 2/includes/Revision.php
+++ b/includes/Revision.php
@@@ -581,11 -581,11 +581,11 @@@ class Revision implements IDBAccessObje
                                return $row['title'];
                        }
  
 -                      $pageId = isset( $row['page'] ) ? $row['page'] : 0;
 -                      $revId = isset( $row['id'] ) ? $row['id'] : 0;
 +                      $pageId = $row['page'] ?? 0;
 +                      $revId = $row['id'] ?? 0;
                } else {
 -                      $pageId = isset( $row->rev_page ) ? $row->rev_page : 0;
 -                      $revId = isset( $row->rev_id ) ? $row->rev_id : 0;
 +                      $pageId = $row->rev_page ?? 0;
 +                      $revId = $row->rev_id ?? 0;
                }
  
                try {
@@@ -1094,8 -1094,6 +1094,6 @@@
  
                // Avoid PHP 7.1 warning of passing $this by reference
                $revision = $this;
-               // TODO: hard-deprecate in 1.32 (or even 1.31?)
-               Hooks::run( 'RevisionInsertComplete', [ &$revision, null, null ] );
  
                return $rec->getId();
        }

diff --combined includes/Storage/RevisionStore.php
index 36af6cd,733b63a..ce09a6e
--- 1/includes/Storage/RevisionStore.php
--- 2/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@@ -47,6 -47,7 +47,7 @@@ use Psr\Log\LoggerAwareInterface
  use Psr\Log\LoggerInterface;
  use Psr\Log\NullLogger;
  use RecentChange;
+ use Revision;
  use stdClass;
  use Title;
  use User;
@@@ -489,6 -490,10 +490,10 @@@ class RevisionStor
  
                Hooks::run( 'RevisionRecordInserted', [ $rev ] );
  
+               // TODO: deprecate in 1.32!
+               $legacyRevision = new Revision( $rev );
+               Hooks::run( 'RevisionInsertComplete', [ &$legacyRevision, null, null ] );
+ 
                return $rev;
        }
  
@@@ -1117,9 -1122,9 +1122,9 @@@
  
                try {
                        $user = User::newFromAnyId(
 -                              isset( $row->ar_user ) ? $row->ar_user : null,
 -                              isset( $row->ar_user_text ) ? $row->ar_user_text : null,
 -                              isset( $row->ar_actor ) ? $row->ar_actor : null
 +                              $row->ar_user ?? null,
 +                              $row->ar_user_text ?? null,
 +                              $row->ar_actor ?? null
                        );
                } catch ( InvalidArgumentException $ex ) {
                        wfWarn( __METHOD__ . ': ' . $ex->getMessage() );
@@@ -1153,8 -1158,8 +1158,8 @@@
                Assert::parameterType( 'object', $row, '$row' );
  
                if ( !$title ) {
 -                      $pageId = isset( $row->rev_page ) ? $row->rev_page : 0; // XXX: also check page_id?
 -                      $revId = isset( $row->rev_id ) ? $row->rev_id : 0;
 +                      $pageId = $row->rev_page ?? 0; // XXX: also check page_id?
 +                      $revId = $row->rev_id ?? 0;
  
                        $title = $this->getTitle( $pageId, $revId, $queryFlags );
                }
@@@ -1168,9 -1173,9 +1173,9 @@@
  
                try {
                        $user = User::newFromAnyId(
 -                              isset( $row->rev_user ) ? $row->rev_user : null,
 -                              isset( $row->rev_user_text ) ? $row->rev_user_text : null,
 -                              isset( $row->rev_actor ) ? $row->rev_actor : null
 +                              $row->rev_user ?? null,
 +                              $row->rev_user_text ?? null,
 +                              $row->rev_actor ?? null
                        );
                } catch ( InvalidArgumentException $ex ) {
                        wfWarn( __METHOD__ . ': ' . $ex->getMessage() );
@@@ -1230,8 -1235,8 +1235,8 @@@
                }
  
                if ( !$title ) {
 -                      $pageId = isset( $fields['page'] ) ? $fields['page'] : 0;
 -                      $revId = isset( $fields['id'] ) ? $fields['id'] : 0;
 +                      $pageId = $fields['page'] ?? 0;
 +                      $revId = $fields['id'] ?? 0;
  
                        $title = $this->getTitle( $pageId, $revId, $queryFlags );
                }
@@@ -1258,7 -1263,7 +1263,7 @@@
                        isset( $fields['comment'] )
                        && !( $fields['comment'] instanceof CommentStoreComment )
                ) {
 -                      $commentData = isset( $fields['comment_data'] ) ? $fields['comment_data'] : null;
 +                      $commentData = $fields['comment_data'] ?? null;
  
                        if ( $fields['comment'] instanceof Message ) {
                                $fields['comment'] = CommentStoreComment::newUnsavedComment(
@@@ -1299,9 -1304,9 +1304,9 @@@
                } else {
                        try {
                                $user = User::newFromAnyId(
 -                                      isset( $fields['user'] ) ? $fields['user'] : null,
 -                                      isset( $fields['user_text'] ) ? $fields['user_text'] : null,
 -                                      isset( $fields['actor'] ) ? $fields['actor'] : null
 +                                      $fields['user'] ?? null,
 +                                      $fields['user_text'] ?? null,
 +                                      $fields['actor'] ?? null
                                );
                        } catch ( InvalidArgumentException $ex ) {
                                $user = null;