From a49b3216fceaa6b0904a2db7d094c62f4eb8a5f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 2 Aug 2016 23:53:25 +0200 Subject: [PATCH] Canonicalise '@deprecated since' doc comments Change-Id: I440041512feb47a998efb45e76e3fd00e0655752 --- includes/DefaultSettings.php | 2 +- includes/GlobalFunctions.php | 4 ++-- includes/Status.php | 4 ++-- includes/deferred/CdnCacheUpdate.php | 2 +- includes/filerepo/FileRepoStatus.php | 2 +- includes/objectcache/ObjectCache.php | 2 +- includes/profiler/ProfileSection.php | 2 +- includes/profiler/ProfilerFunctions.php | 4 ++-- includes/site/SiteSQLStore.php | 4 ++-- includes/specials/SpecialResetTokens.php | 2 +- includes/user/User.php | 2 +- resources/src/jquery/jquery.accessKeyLabel.js | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 592632864c..38ad63b6ec 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2524,7 +2524,7 @@ $wgFileCacheDepth = 2; /** * Kept for extension compatibility; see $wgParserCacheType - * @deprecated 1.26 + * @deprecated since 1.26 */ $wgEnableParserCache = true; diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index e19c36c1a4..7117f4c29a 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -2950,7 +2950,7 @@ function wfRelativePath( $path, $from ) { * Supports base 2 through 36; digit values 10-36 are represented * as lowercase letters a-z. Input is case-insensitive. * - * @deprecated 1.27 Use Wikimedia\base_convert() directly + * @deprecated since 1.27 Use Wikimedia\base_convert() directly * * @param string $input Input number * @param int $sourceBase Base of the input number @@ -3525,7 +3525,7 @@ function wfGetParserCacheStorage() { * @param string|null $deprecatedVersion Optionally mark hook as deprecated with version number * * @return bool True if no handler aborted the hook - * @deprecated 1.25 - use Hooks::run + * @deprecated since 1.25 - use Hooks::run */ function wfRunHooks( $event, array $args = [], $deprecatedVersion = null ) { return Hooks::run( $event, $args, $deprecatedVersion ); diff --git a/includes/Status.php b/includes/Status.php index 45d8bed2fa..e5788733cf 100644 --- a/includes/Status.php +++ b/includes/Status.php @@ -385,7 +385,7 @@ class Status { * * @return array A list in which each entry is an array with a message key as its first element. * The remaining array elements are the message parameters. - * @deprecated 1.25 + * @deprecated since 1.25 */ public function getErrorsArray() { return $this->getStatusArray( 'error' ); @@ -396,7 +396,7 @@ class Status { * * @return array A list in which each entry is an array with a message key as its first element. * The remaining array elements are the message parameters. - * @deprecated 1.25 + * @deprecated since 1.25 */ public function getWarningsArray() { return $this->getStatusArray( 'warning' ); diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php index 4ce9e62369..470086ae9f 100644 --- a/includes/deferred/CdnCacheUpdate.php +++ b/includes/deferred/CdnCacheUpdate.php @@ -65,7 +65,7 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate { /** * @param Title $title * @return CdnCacheUpdate - * @deprecated 1.27 + * @deprecated since 1.27 */ public static function newSimplePurge( Title $title ) { return new CdnCacheUpdate( $title->getCdnUrls() ); diff --git a/includes/filerepo/FileRepoStatus.php b/includes/filerepo/FileRepoStatus.php index 67080b6f83..538e9bc9da 100644 --- a/includes/filerepo/FileRepoStatus.php +++ b/includes/filerepo/FileRepoStatus.php @@ -24,7 +24,7 @@ /** * Generic operation result class for FileRepo-related operations * @ingroup FileRepo - * @deprecated 1.25 + * @deprecated since 1.25 */ class FileRepoStatus extends Status { } diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 26f3356195..108339387f 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -278,7 +278,7 @@ class ObjectCache { * @param array $params [optional] Array key 'fallback' for $fallback. * @param int|string $fallback Fallback cache, e.g. (CACHE_NONE, "hash") (since 1.24) * @return BagOStuff - * @deprecated 1.27 + * @deprecated since 1.27 */ public static function newAccelerator( $params = [], $fallback = null ) { if ( $fallback === null ) { diff --git a/includes/profiler/ProfileSection.php b/includes/profiler/ProfileSection.php index d787edb702..32daeed4bf 100644 --- a/includes/profiler/ProfileSection.php +++ b/includes/profiler/ProfileSection.php @@ -25,7 +25,7 @@ * Class for handling function-scope profiling * * @since 1.22 - * @deprecated 1.25 No-op now + * @deprecated since 1.25 No-op now */ class ProfileSection { /** diff --git a/includes/profiler/ProfilerFunctions.php b/includes/profiler/ProfilerFunctions.php index 50a77ecd9a..cc716300a0 100644 --- a/includes/profiler/ProfilerFunctions.php +++ b/includes/profiler/ProfilerFunctions.php @@ -42,7 +42,7 @@ function wfGetRusage() { /** * Begin profiling of a function * @param string $functionname Name of the function we will profile - * @deprecated 1.25 + * @deprecated since 1.25 */ function wfProfileIn( $functionname ) { } @@ -50,7 +50,7 @@ function wfProfileIn( $functionname ) { /** * Stop profiling of a function * @param string $functionname Name of the function we have profiled - * @deprecated 1.25 + * @deprecated since 1.25 */ function wfProfileOut( $functionname = 'missing' ) { } diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php index a4116aea0f..2f8a113ca4 100644 --- a/includes/site/SiteSQLStore.php +++ b/includes/site/SiteSQLStore.php @@ -35,8 +35,8 @@ class SiteSQLStore { * @note This does not return an instance of SiteSQLStore! * * @since 1.21 - * @deprecated 1.27 use MediaWikiServices::getSiteStore() or MediaWikiServices::getSiteLookup() - * instead. + * @deprecated since 1.27 use MediaWikiServices::getSiteStore() + * or MediaWikiServices::getSiteLookup() instead. * * @param null $sitesTable IGNORED * @param null $cache IGNORED diff --git a/includes/specials/SpecialResetTokens.php b/includes/specials/SpecialResetTokens.php index a475f05ff7..3e896863b2 100644 --- a/includes/specials/SpecialResetTokens.php +++ b/includes/specials/SpecialResetTokens.php @@ -25,7 +25,7 @@ * Let users reset tokens like the watchlist token. * * @ingroup SpecialPage - * @deprecated 1.26 + * @deprecated since 1.26 */ class SpecialResetTokens extends FormSpecialPage { private $tokensList; diff --git a/includes/user/User.php b/includes/user/User.php index 39507af97a..c46836ba0f 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -3018,7 +3018,7 @@ class User implements IDBAccessObject { * @return string|bool User's current value for the option, or false if this option is disabled. * @see resetTokenFromOption() * @see getOption() - * @deprecated 1.26 Applications should use the OAuth extension + * @deprecated since 1.26 Applications should use the OAuth extension */ public function getTokenFromOption( $oname ) { global $wgHiddenPrefs; diff --git a/resources/src/jquery/jquery.accessKeyLabel.js b/resources/src/jquery/jquery.accessKeyLabel.js index 6ff2e01810..e52d6a7c86 100644 --- a/resources/src/jquery/jquery.accessKeyLabel.js +++ b/resources/src/jquery/jquery.accessKeyLabel.js @@ -197,7 +197,7 @@ $.fn.updateTooltipAccessKeys.getAccessKeyLabel = getAccessKeyLabel; * getAccessKeyPrefix * * @method updateTooltipAccessKeys_getAccessKeyPrefix - * @deprecated 1.27 Use #getAccessKeyModifiers + * @deprecated since 1.27 Use #getAccessKeyModifiers */ $.fn.updateTooltipAccessKeys.getAccessKeyPrefix = function ( ua ) { return getAccessKeyModifiers( ua ).join( '-' ) + '-'; -- 2.20.1