From: Kunal Mehta <legoktm@member.fsf.org>
Date: Sat, 10 Sep 2016 07:14:20 +0000 (-0700)
Subject: Linker: Deprecate formatSize()
X-Git-Tag: 1.31.0-rc.0~5547^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=b6ac6ab899cd9baaadfc41dc82b7c9bd8dd2d1bc;p=lhc%2Fweb%2Fwiklou.git

Linker: Deprecate formatSize()

This is a static function that uses global state through $wgLang, and
provides no benefit than calling Language::formatSize() directly aside
from escaping. But that should generally be handled closer to output
generation.

Change-Id: I35fdbaf2fcaa89f0d4442e1f63ec8ed29e0c339f
---

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index bd05309d6c..c30be8b592 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -138,6 +138,7 @@ changes to languages because of Phabricator reports.
   MediaWiki\Linker\LinkRenderer. In addition, the LinkBegin and LinkEnd hooks
   were replaced by HtmlPageLinkRendererBegin and HtmlPageLinkRendererEnd
   respectively. See docs/hooks.txt for the specific changes needed for those hooks.
+* Linker::formatSize() was deprecated. Use Language::formatSize() directly.
 * Aliases for Linker methods, deprecated since 1.21, were removed from Skin:
   * Skin::commentBlock() (use Linker::commentBlock() instead)
   * Skin::generateRollback() (use Linker::generateRollback() instead)
diff --git a/includes/DummyLinker.php b/includes/DummyLinker.php
index ba24799818..808a406d4c 100644
--- a/includes/DummyLinker.php
+++ b/includes/DummyLinker.php
@@ -471,7 +471,12 @@ class DummyLinker {
 		return Linker::formatHiddenCategories( $hiddencats );
 	}
 
+	/**
+	 * @deprecated since 1.28, use Language::formatSize() directly
+	 */
 	public function formatSize( $size ) {
+		wfDeprecated( __METHOD__, '1.28' );
+
 		return Linker::formatSize( $size );
 	}
 
diff --git a/includes/Linker.php b/includes/Linker.php
index bcc348e7d6..21d87d8a97 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -2049,6 +2049,8 @@ class Linker {
 	}
 
 	/**
+	 * @deprecated since 1.28, use Language::formatSize() directly
+	 *
 	 * Format a size in bytes for output, using an appropriate
 	 * unit (B, KB, MB or GB) according to the magnitude in question
 	 *
@@ -2057,6 +2059,8 @@ class Linker {
 	 * @return string
 	 */
 	public static function formatSize( $size ) {
+		wfDeprecated( __METHOD__, '1.28' );
+
 		global $wgLang;
 		return htmlspecialchars( $wgLang->formatSize( $size ) );
 	}