Remove ancient deprecated functions:

* Article::getDB(), deprecated in 1.13 (r36334)
* Article::showArticle() - 1.7 (r14809)
* User::SetupSession() - 1.8 (r15823)
* User::isBot() - 1.8 (r15689)
Annotate other deprecated functions with @since <version>

diff --git a/includes/Article.php b/includes/Article.php
index 8e6c293..8df256a 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -160,7 +160,7 @@ class Article {
         *
         * @param $text string article content containing redirect info
         * @return mixed false, Title of in-wiki target, or string with URL
-        * @deprecated
+        * @deprecated @since 1.17
         */
        public function followRedirectText( $text ) {
                // recurse through to only get the final target
@@ -1934,6 +1934,7 @@ class Article {
        /**
         * This function is not deprecated until somebody fixes the core not to use
         * it. Nevertheless, use Article::doEdit() instead.
+        * @deprecated @since 1.7
         */
        function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC = false, $comment = false, $bot = false ) {
                $flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
@@ -1965,7 +1966,7 @@ class Article {
        }
 
        /**
-        * @deprecated use Article::doEdit()
+        * @deprecated @since 1.7 use Article::doEdit()
         */
        function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
                $flags = EDIT_UPDATE | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
@@ -2311,14 +2312,6 @@ class Article {
                return $status;
        }
 
-       /**
-        * @deprecated wrapper for doRedirect
-        */
-       public function showArticle( $text, $subtitle , $sectionanchor = '', $me2, $now, $summary, $oldid ) {
-               wfDeprecated( __METHOD__ );
-               $this->doRedirect( $this->isRedirect( $text ), $sectionanchor );
-       }
-
        /**
         * Output a redirect back to the article.
         * This is typically used after an edit.
@@ -4556,18 +4549,6 @@ class Article {
                }
        }
 
-       // Deprecated methods
-       /**
-        * Get the database which should be used for reads
-        *
-        * @return Database
-        * @deprecated - just call wfGetDB( DB_MASTER ) instead
-        */
-       function getDB() {
-               wfDeprecated( __METHOD__ );
-               return wfGetDB( DB_MASTER );
-       }
-
 }
 
 class PoolWorkArticleView extends PoolCounterWork {

diff --git a/includes/User.php b/includes/User.php
index acb64c9..594a109 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -820,14 +820,6 @@ class User {
                wfProfileOut( __METHOD__ );
        }
 
-       /**
-        * @deprecated Use wfSetupSession().
-        */
-       function SetupSession() {
-               wfDeprecated( __METHOD__ );
-               wfSetupSession();
-       }
-
        /**
         * Load user data from the session or login cookie. If there are no valid
         * credentials, initialises the user as an anonymous user.
@@ -2176,16 +2168,6 @@ class User {
                return !$this->isLoggedIn();
        }
 
-       /**
-        * Get whether the user is a bot
-        * @return Bool
-        * @deprecated use isAllowed('bot')
-        */
-       function isBot() {
-               wfDeprecated( __METHOD__ );
-               return $this->isAllowed( 'bot' );
-       }
-
        /**
         * Check if user is allowed to access a feature / make an action
         * @param $action String action to be checked
@@ -2663,7 +2645,7 @@ class User {
         * which will give them a chance to modify this key based on their own
         * settings.
         *
-        * @deprecated use the ParserOptions object to get the relevant options
+        * @deprecated @since 1.17 use the ParserOptions object to get the relevant options
         * @return String Page rendering hash
         */
        function getPageRenderingHash() {