From 59002d8935e48d1e6c0640b0f7102c9ff6dd2ef5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 15 Apr 2014 22:18:19 +0200 Subject: [PATCH] Consistently use '@deprecated since ' Variants included 'in ', 'as of ' and just the version number. Some @deprecated annotations do not have the version number at all, I want to hunt them down separately. Change-Id: I8208c6097098f4735d4f51bc42254675f1f27f6d --- includes/Article.php | 6 +++--- includes/Collation.php | 2 +- includes/EditPage.php | 8 ++++---- includes/Export.php | 2 +- includes/GlobalFunctions.php | 4 ++-- includes/OutputPage.php | 4 ++-- includes/Preferences.php | 4 ++-- includes/Revision.php | 2 +- includes/Skin.php | 2 +- includes/Title.php | 6 +++--- includes/User.php | 2 +- includes/WikiPage.php | 14 +++++++------- includes/actions/RawAction.php | 2 +- includes/changes/RecentChange.php | 4 ++-- includes/clientpool/RedisConnectionPool.php | 2 +- includes/db/DatabaseMysqlBase.php | 2 +- includes/db/LoadBalancer.php | 2 +- includes/filerepo/file/ArchivedFile.php | 2 +- includes/gallery/TraditionalImageGallery.php | 2 +- includes/jobqueue/jobs/RefreshLinksJob2.php | 2 +- includes/logging/LogEventsList.php | 4 ++-- includes/logging/LogPage.php | 4 ++-- includes/objectcache/BagOStuff.php | 2 +- includes/parser/ParserOptions.php | 2 +- includes/specialpage/SpecialPage.php | 2 +- includes/specials/SpecialUserrights.php | 2 +- languages/Language.php | 8 ++++---- 27 files changed, 49 insertions(+), 49 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 113372460b..5ebeb6072d 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -238,7 +238,7 @@ class Article implements Page { * This function has side effects! Do not use this function if you * only want the real revision text if any. * - * @deprecated in 1.21; use WikiPage::getContent() instead + * @deprecated since 1.21; use WikiPage::getContent() instead * * @return string Return the text of this revision */ @@ -355,7 +355,7 @@ class Article implements Page { /** * Load the revision (including text) into this object * - * @deprecated in 1.19; use fetchContent() + * @deprecated since 1.19; use fetchContent() */ function loadContent() { wfDeprecated( __METHOD__, '1.19' ); @@ -374,7 +374,7 @@ class Article implements Page { * has to remain public for now. * * @return mixed string containing article contents, or false if null - * @deprecated in 1.21, use WikiPage::getContent() instead + * @deprecated since 1.21, use WikiPage::getContent() instead */ function fetchContent() { #BC cruft! ContentHandler::deprecated( __METHOD__, '1.21' ); diff --git a/includes/Collation.php b/includes/Collation.php index 88e15b33d4..050ec63ffc 100644 --- a/includes/Collation.php +++ b/includes/Collation.php @@ -514,7 +514,7 @@ class IcuCollation extends Collation { * Do a binary search, and return the index of the largest item that sorts * less than or equal to the target value. * - * @deprecated in 1.23; use ArrayUtils::findLowerBound() instead + * @deprecated since 1.23; use ArrayUtils::findLowerBound() instead * * @param array $valueCallback A function to call to get the value with * a given array index. diff --git a/includes/EditPage.php b/includes/EditPage.php index d0bd7c79f1..c266996082 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -545,7 +545,7 @@ class EditPage { * Show a read-only error * Parameters are the same as OutputPage:readOnlyPage() * Redirect to the article page if redlink=1 - * @deprecated in 1.19; use displayPermissionsError() instead + * @deprecated since 1.19; use displayPermissionsError() instead */ function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) { wfDeprecated( __METHOD__, '1.19' ); @@ -3623,7 +3623,7 @@ HTML /** * Call the stock "user is blocked" page * - * @deprecated in 1.19; throw an exception directly instead + * @deprecated since 1.19; throw an exception directly instead */ function blockedPage() { wfDeprecated( __METHOD__, '1.19' ); @@ -3635,7 +3635,7 @@ HTML /** * Produce the stock "please login to edit pages" page * - * @deprecated in 1.19; throw an exception directly instead + * @deprecated since 1.19; throw an exception directly instead */ function userNotLoggedInPage() { wfDeprecated( __METHOD__, '1.19' ); @@ -3646,7 +3646,7 @@ HTML * Show an error page saying to the user that he has insufficient permissions * to create a new page * - * @deprecated in 1.19; throw an exception directly instead + * @deprecated since 1.19; throw an exception directly instead */ function noCreatePermission() { wfDeprecated( __METHOD__, '1.19' ); diff --git a/includes/Export.php b/includes/Export.php index 2844a06e5f..0ebdb7868b 100644 --- a/includes/Export.php +++ b/includes/Export.php @@ -477,7 +477,7 @@ class WikiExporter { class XmlDumpWriter { /** * Returns the export schema version. - * @deprecated in 1.20; use WikiExporter::schemaVersion() instead + * @deprecated since 1.20; use WikiExporter::schemaVersion() instead * @return string */ function schemaVersion() { diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index c900306ed7..b1328261de 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2000,7 +2000,7 @@ function wfShowingResults( $offset, $limit ) { * @param string $query optional URL query parameter string * @param bool $atend optional param for specified if this is the last page * @return string - * @deprecated in 1.19; use Language::viewPrevNext() instead + * @deprecated since 1.19; use Language::viewPrevNext() instead */ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) { wfDeprecated( __METHOD__, '1.19' ); @@ -4138,7 +4138,7 @@ function wfCanIPUseHTTPS( $ip ) { * Work out the IP address based on various globals * For trusted proxies, use the XFF client IP (first of the chain) * - * @deprecated in 1.19; call $wgRequest->getIP() directly. + * @deprecated since 1.19; call $wgRequest->getIP() directly. * @return string */ function wfGetIP() { diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 052ab34df2..f5dbfc6d58 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -930,7 +930,7 @@ class OutputPage extends ContextSource { /** * Add $str to the subtitle * - * @deprecated in 1.19; use addSubtitle() instead + * @deprecated since 1.19; use addSubtitle() instead * @param string|Message $str to add to the subtitle */ public function appendSubtitle( $str ) { @@ -2265,7 +2265,7 @@ class OutputPage extends ContextSource { /** * Produce the stock "please login to use the wiki" page * - * @deprecated in 1.19; throw the exception directly + * @deprecated since 1.19; throw the exception directly */ public function loginToUse() { throw new PermissionsError( 'read' ); diff --git a/includes/Preferences.php b/includes/Preferences.php index 1825cceab7..6075623a99 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -1475,7 +1475,7 @@ class Preferences { * Caller is responsible for checking $wgAuth and 'editmyprivateinfo' * right. * - * @deprecated in 1.20; use User::setEmailWithConfirmation() instead. + * @deprecated since 1.20; use User::setEmailWithConfirmation() instead. * @param $user User * @param string $newaddr New email address * @return Array (true on success or Status on failure, info string) @@ -1492,7 +1492,7 @@ class Preferences { } /** - * @deprecated in 1.19 + * @deprecated since 1.19 * @param $user User * @return array */ diff --git a/includes/Revision.php b/includes/Revision.php index 1ad0b4a3c1..797980f809 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -975,7 +975,7 @@ class Revision implements IDBAccessObject { * @param $user User object to check for, only if FOR_THIS_USER is passed * to the $audience parameter * - * @deprecated in 1.21, use getContent() instead + * @deprecated since 1.21, use getContent() instead * @todo Replace usage in core * @return String */ diff --git a/includes/Skin.php b/includes/Skin.php index e6abdfb6fb..87625652b3 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -397,7 +397,7 @@ abstract class Skin extends ContextSource { /** * Make a "