Merge "Emit deprecation warnings for Article::doEdit and WikiPage::doEdit"

diff --combined includes/page/WikiPage.php
index 41e9e4f,eb2f393..9befdcd
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -1577,7 -1577,7 +1577,7 @@@ class WikiPage implements Page, IDBAcce
         * @deprecated since 1.21: use doEditContent() instead.
         */
        public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
-               ContentHandler::deprecated( __METHOD__, '1.21' );
+               wfDeprecated( __METHOD__, '1.21' );
  
                $content = ContentHandler::makeContent( $text, $this->getTitle() );
  
@@@ -3502,7 -3502,7 +3502,7 @@@
                $dbr = wfGetDB( DB_REPLICA );
                $res = $dbr->select( 'categorylinks',
                        [ 'cl_to AS page_title, ' . NS_CATEGORY . ' AS page_namespace' ],
 -                      // Have to do that since DatabaseBase::fieldNamesWithAlias treats numeric indexes
 +                      // Have to do that since Database::fieldNamesWithAlias treats numeric indexes
                        // as not being aliases, and NS_CATEGORY is numeric
                        [ 'cl_from' => $id ],
                        __METHOD__ );