Merge "Make WikiPage::prepareTextForEdit() emit deprecation warnings"

diff --combined includes/page/WikiPage.php
index 2833965,8748856..c791587
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -1678,7 -1678,7 +1678,7 @@@ class WikiPage implements Page, IDBAcce
                                                        $flags & EDIT_MINOR, null, null, &$flags, &$hookStatus ];
                // Check if the hook rejected the attempted save
                if ( !Hooks::run( 'PageContentSave', $hook_args )
 -                      || !ContentHandler::runLegacyHooks( 'ArticleSave', $hook_args )
 +                      || !ContentHandler::runLegacyHooks( 'ArticleSave', $hook_args, '1.21' )
                ) {
                        if ( $hookStatus->isOK() ) {
                                // Hook returned false but didn't call fatal(); use generic message
@@@ -2023,11 -2023,11 +2023,11 @@@
                                        // Trigger post-create hook
                                        $params = [ &$this, &$user, $content, $summary,
                                                $flags & EDIT_MINOR, null, null, &$flags, $revision ];
 -                                      ContentHandler::runLegacyHooks( 'ArticleInsertComplete', $params );
 +                                      ContentHandler::runLegacyHooks( 'ArticleInsertComplete', $params, '1.21' );
                                        Hooks::run( 'PageContentInsertComplete', $params );
                                        // Trigger post-save hook
                                        $params = array_merge( $params, [ &$status, $meta['baseRevId'] ] );
 -                                      ContentHandler::runLegacyHooks( 'ArticleSaveComplete', $params );
 +                                      ContentHandler::runLegacyHooks( 'ArticleSaveComplete', $params, '1.21' );
                                        Hooks::run( 'PageContentSaveComplete', $params );
  
                                }
@@@ -2075,7 -2075,7 +2075,7 @@@
         * @return object
         */
        public function prepareTextForEdit( $text, $revid = null, User $user = null ) {
-               ContentHandler::deprecated( __METHOD__, '1.21' );
+               wfDeprecated( __METHOD__, '1.21' );
                $content = ContentHandler::makeContent( $text, $this->getTitle() );
                return $this->prepareContentForEdit( $content, $revid, $user );
        }