From: umherirrender Date: Sat, 30 Jan 2016 12:44:01 +0000 (+0100) Subject: Remove unused functions from unroll of Article::__call X-Git-Tag: 1.31.0-rc.0~8118^2~1 X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=0204a28443606a2b3026d403c625f3a089841430;p=lhc%2Fweb%2Fwiklou.git Remove unused functions from unroll of Article::__call With I779aa1c017abc9a17047fd5335f2d082148daa6f all public functions from WikiPage were copied as delegator into Article. Now remove the unused functions and add a release notes Change-Id: I9cc79acedecb003048e1add568e8bba96ddbb41a --- diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index a79a7b280e..2636f54f7d 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -307,6 +307,38 @@ changes to languages because of Phabricator reports. rather than consume everything until the end of the page. * New maintenance script resetUserEmail.php allows sysadmins to reset user emails in case a user forgot password/account was stolen. +* Article::checkFlags was removed. Use Wikipage. +* Article::clearPreparedEdit was removed. Use Wikipage. +* Article::doDeleteArticleReal was removed. Use Wikipage. +* Article::doDeleteUpdates was removed. Use Wikipage. +* Article::doQuickEditContent was removed. Use Wikipage. +* Article::doViewUpdates was removed. Use Wikipage. +* Article::getAutoDeleteReason was removed. Use Wikipage. +* Article::getContributors was removed. Use Wikipage. +* Article::getCreator was removed. Use Wikipage. +* Article::getDeletionUpdates was removed. Use Wikipage. +* Article::getHiddenCategories was removed. Use Wikipage. +* Article::getLinksTimestamp was removed. Use Wikipage. +* Article::getMinorEdit was removed. Use Wikipage. +* Article::getRedirectURL was removed. Use Wikipage. +* Article::getUndoContent was removed. Use Wikipage. +* Article::getUndoText was removed. Use Wikipage. +* Article::insertProtectNullRevision was removed. Use Wikipage. +* Article::insertRedirect was removed. Use Wikipage. +* Article::insertRedirectEntry was removed. Use Wikipage. +* Article::loadPageData was removed. Use Wikipage. +* Article::lockAndGetLatest was removed. Use Wikipage. +* Article::pageDataFromId was removed. Use Wikipage. +* Article::pageDataFromTitle was removed. Use Wikipage. +* Article::protectDescription was removed. Use Wikipage. +* Article::protectDescriptionLog was removed. Use Wikipage. +* Article::replaceSectionAtRev was removed. Use Wikipage. +* Article::shouldCheckParserCache was removed. Use Wikipage. +* Article::supportsSections was removed. Use Wikipage. +* Article::triggerOpportunisticLinksUpdate was removed. Use Wikipage. +* Article::updateCategoryCounts was removed. Use Wikipage. +* Article::updateIfNewerOn was removed. Use Wikipage. +* Article::updateRedirectOn was removed. Use Wikipage. == Compatibility == diff --git a/includes/Linker.php b/includes/Linker.php index 4b9b963060..69550d31d0 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -2108,7 +2108,7 @@ class Linker { /** * Returns HTML for the "hidden categories on this page" list. * - * @param array $hiddencats Array of hidden categories from Article::getHiddenCategories + * @param array $hiddencats Array of hidden categories from WikiPage::getHiddenCategories * or similar * @return string HTML output */ diff --git a/includes/page/Article.php b/includes/page/Article.php index 938c049a58..a87b4780e5 100644 --- a/includes/page/Article.php +++ b/includes/page/Article.php @@ -2083,14 +2083,6 @@ class Article implements Page { } } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::checkFlags - */ - public function checkFlags( $flags ) { - return $this->mPage->checkFlags( $flags ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::checkTouched @@ -2099,34 +2091,6 @@ class Article implements Page { return $this->mPage->checkTouched(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::clearPreparedEdit - */ - public function clearPreparedEdit() { - return $this->mPage->clearPreparedEdit(); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::doDeleteArticleReal - */ - public function doDeleteArticleReal( - $reason, $suppress = false, $u1 = null, $u2 = null, &$error = '', User $user = null - ) { - return $this->mPage->doDeleteArticleReal( - $reason, $suppress, $u1, $u2, $error, $user - ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::doDeleteUpdates - */ - public function doDeleteUpdates( $id, Content $content = null ) { - return $this->mPage->doDeleteUpdates( $id, $content ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::doEdit @@ -2164,26 +2128,6 @@ class Article implements Page { return $this->mPage->doPurge(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::doQuickEditContent - */ - public function doQuickEditContent( - Content $content, User $user, $comment = '', $minor = false, $serialFormat = null - ) { - return $this->mPage->doQuickEditContent( - $content, $user, $comment, $minor, $serialFormat - ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::doViewUpdates - */ - public function doViewUpdates( User $user, $oldid = 0 ) { - return $this->mPage->doViewUpdates( $user, $oldid ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::exists @@ -2208,14 +2152,6 @@ class Article implements Page { return $this->mPage->getActionOverrides(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getAutoDeleteReason - */ - public function getAutoDeleteReason( &$hasHistory ) { - return $this->mPage->getAutoDeleteReason( $hasHistory ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::getCategories @@ -2248,38 +2184,6 @@ class Article implements Page { return $this->mPage->getContentModel(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getContributors - */ - public function getContributors() { - return $this->mPage->getContributors(); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getCreator - */ - public function getCreator( $audience = Revision::FOR_PUBLIC, User $user = null ) { - return $this->mPage->getCreator( $audience, $user ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getDeletionUpdates - */ - public function getDeletionUpdates( Content $content = null ) { - return $this->mPage->getDeletionUpdates( $content ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getHiddenCategories - */ - public function getHiddenCategories() { - return $this->mPage->getHiddenCategories(); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::getId @@ -2296,22 +2200,6 @@ class Article implements Page { return $this->mPage->getLatest(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getLinksTimestamp - */ - public function getLinksTimestamp() { - return $this->mPage->getLinksTimestamp(); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getMinorEdit - */ - public function getMinorEdit() { - return $this->mPage->getMinorEdit(); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::getOldestRevision @@ -2328,14 +2216,6 @@ class Article implements Page { return $this->mPage->getRedirectTarget(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getRedirectURL - */ - public function getRedirectURL( $rt ) { - return $this->mPage->getRedirectURL( $rt ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::getRevision @@ -2369,23 +2249,6 @@ class Article implements Page { return $this->mPage->getTouched(); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getUndoContent - */ - public function getUndoContent( Revision $undo, Revision $undoafter = null ) { - return $this->mPage->getUndoContent( $undo, $undoafter ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::getUndoText - */ - public function getUndoText( Revision $undo, Revision $undoafter = null ) { - ContentHandler::deprecated( __METHOD__, '1.21' ); - return $this->mPage->getUndoText( $undo, $undoafter ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::getUser @@ -2418,34 +2281,6 @@ class Article implements Page { return $this->mPage->insertOn( $dbw, $pageId ); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::insertProtectNullRevision - */ - public function insertProtectNullRevision( $revCommentMsg, array $limit, - array $expiry, $cascade, $reason, $user = null - ) { - return $this->mPage->insertProtectNullRevision( $revCommentMsg, $limit, - $expiry, $cascade, $reason, $user - ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::insertRedirect - */ - public function insertRedirect() { - return $this->mPage->insertRedirect(); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::insertRedirectEntry - */ - public function insertRedirectEntry( Title $rt, $oldLatest = null ) { - return $this->mPage->insertRedirectEntry( $rt, $oldLatest ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::isCountable @@ -2470,22 +2305,6 @@ class Article implements Page { return $this->mPage->loadFromRow( $data, $from ); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::loadPageData - */ - public function loadPageData( $from = 'fromdb' ) { - return $this->mPage->loadPageData( $from ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::lockAndGetLatest - */ - public function lockAndGetLatest() { - return $this->mPage->lockAndGetLatest(); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::makeParserOptions @@ -2494,22 +2313,6 @@ class Article implements Page { return $this->mPage->makeParserOptions( $context ); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::pageDataFromId - */ - public function pageDataFromId( $dbr, $id, $options = array() ) { - return $this->mPage->pageDataFromId( $dbr, $id, $options ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::pageDataFromTitle - */ - public function pageDataFromTitle( $dbr, $title, $options = array() ) { - return $this->mPage->pageDataFromTitle( $dbr, $title, $options ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::prepareContentForEdit @@ -2532,22 +2335,6 @@ class Article implements Page { return $this->mPage->prepareTextForEdit( $text, $revid, $user ); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::protectDescription - */ - public function protectDescription( array $limit, array $expiry ) { - return $this->mPage->protectDescription( $limit, $expiry ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::protectDescriptionLog - */ - public function protectDescriptionLog( array $limit, array $expiry ) { - return $this->mPage->protectDescriptionLog( $limit, $expiry ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::replaceSection @@ -2561,18 +2348,6 @@ class Article implements Page { ); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::replaceSectionAtRev - */ - public function replaceSectionAtRev( $sectionId, Content $sectionContent, - $sectionTitle = '', $baseRevId = null - ) { - return $this->mPage->replaceSectionAtRev( $sectionId, $sectionContent, - $sectionTitle, $baseRevId - ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::replaceSectionContent @@ -2593,54 +2368,6 @@ class Article implements Page { return $this->mPage->setTimestamp( $ts ); } - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::shouldCheckParserCache - */ - public function shouldCheckParserCache( ParserOptions $parserOptions, $oldId ) { - return $this->mPage->shouldCheckParserCache( $parserOptions, $oldId ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::supportsSections - */ - public function supportsSections() { - return $this->mPage->supportsSections(); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::triggerOpportunisticLinksUpdate - */ - public function triggerOpportunisticLinksUpdate( ParserOutput $parserOutput ) { - return $this->mPage->triggerOpportunisticLinksUpdate( $parserOutput ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::updateCategoryCounts - */ - public function updateCategoryCounts( array $added, array $deleted ) { - return $this->mPage->updateCategoryCounts( $added, $deleted ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::updateIfNewerOn - */ - public function updateIfNewerOn( $dbw, $revision ) { - return $this->mPage->updateIfNewerOn( $dbw, $revision ); - } - - /** - * Call to WikiPage function for backwards compatibility. - * @see WikiPage::updateRedirectOn - */ - public function updateRedirectOn( $dbw, $redirectTitle, $lastRevIsRedirect = null ) { - return $this->mPage->updateRedirectOn( $dbw, $redirectTitle, $lastRevIsRedirect = null ); - } - /** * Call to WikiPage function for backwards compatibility. * @see WikiPage::updateRevisionOn