From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 29 Nov 2017 22:43:07 +0000 (+0000)
Subject: Merge "Add wfDeprecated() call to MimeMagic::singleton()"
X-Git-Tag: 1.31.0-rc.0~1354
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=55cb4d0065f625d074db50524525f9d28fee3ff8;hp=b4f25a914749200e74ea370c226e9b367d6d6970

Merge "Add wfDeprecated() call to MimeMagic::singleton()"
---

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index a2a44bb868..6152d2262f 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -31,6 +31,7 @@ class MimeMagic extends MimeAnalyzer {
 	 * @deprecated since 1.28 get a MimeAnalyzer instance from MediaWikiServices
 	 */
 	public static function singleton() {
+		wfDeprecated( __METHOD__, '1.28' );
 		// XXX: We know that the MimeAnalyzer is currently an instance of MimeMagic
 		$instance = MediaWikiServices::getInstance()->getMimeAnalyzer();
 		Assert::postcondition(