Merge "Avoid using deprecated PreparedEdit::$pst"

diff --combined includes/page/WikiPage.php
index 9b65a33,478b1dc..c05ba45
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -1607,7 -1607,7 +1607,7 @@@ class WikiPage implements Page, IDBAcce
                $meta = [
                        'bot' => ( $flags & EDIT_FORCE_BOT ),
                        'minor' => ( $flags & EDIT_MINOR ) && $user->isAllowed( 'minoredit' ),
-                       'serialized' => $editInfo->pst,
+                       'serialized' => $pstContent->serialize( $serialFormat ),
                        'serialFormat' => $serialFormat,
                        'baseRevId' => $baseRevId,
                        'oldRevision' => $old_revision,
@@@ -2973,7 -2973,7 +2973,7 @@@
                }
  
                // Clear caches
 -              WikiPage::onArticleDelete( $this->mTitle );
 +              self::onArticleDelete( $this->mTitle );
                ResourceLoaderWikiModule::invalidateModuleCache(
                        $this->mTitle, $revision, null, wfWikiID()
                );