From e912be738792a66a96b4ffaa0d6f60a56ca54429 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 2 Feb 2018 12:39:57 -0800
Subject: [PATCH] skins: Remove MediaWikiI18N class and
 QuickTemplate::setTranslator

Deprecated in 1.31.

Bug: T186090
Change-Id: I2ff268868bf6f112add6fc3a5718e83467781b13
---
 RELEASE-NOTES-1.32               |  5 ++-
 autoload.php                     |  1 -
 includes/skins/MediaWikiI18N.php | 60 --------------------------------
 includes/skins/QuickTemplate.php | 16 ---------
 4 files changed, 4 insertions(+), 78 deletions(-)
 delete mode 100644 includes/skins/MediaWikiI18N.php

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index de41aa4bfe..05fe276a6d 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -40,8 +40,11 @@ changes to languages because of Phabricator reports.
 * …
 
 === Breaking changes in 1.32 ===
-* $wgRequestTime (deprecated in 1.25) was removed.
+* $wgRequestTime was removed (deprecated in 1.25).
   Use $_SERVER['REQUEST_TIME_FLOAT'] or WebRequest::getElapsedTime() instead.
+* The MediaWikiI18N class was removed (deprecated in 1.31).
+* QuickTemplate::setTranslator() was removed (deprecated in 1.31).
+  Use Skin::msg() instead.
 
 === Deprecations in 1.32 ===
 * Use of a StartProfiler.php file is deprecated in favour of placing
diff --git a/autoload.php b/autoload.php
index 0e1b30fe0f..bc0e69e718 100644
--- a/autoload.php
+++ b/autoload.php
@@ -843,7 +843,6 @@ $wgAutoloadLocalClasses = [
 	'MediaTransformInvalidParametersException' => __DIR__ . '/includes/media/MediaTransformInvalidParametersException.php',
 	'MediaTransformOutput' => __DIR__ . '/includes/media/MediaTransformOutput.php',
 	'MediaWiki' => __DIR__ . '/includes/MediaWiki.php',
-	'MediaWikiI18N' => __DIR__ . '/includes/skins/MediaWikiI18N.php',
 	'MediaWikiShell' => __DIR__ . '/maintenance/shell.php',
 	'MediaWikiSite' => __DIR__ . '/includes/site/MediaWikiSite.php',
 	'MediaWikiTitleCodec' => __DIR__ . '/includes/title/MediaWikiTitleCodec.php',
diff --git a/includes/skins/MediaWikiI18N.php b/includes/skins/MediaWikiI18N.php
deleted file mode 100644
index 731897e4c5..0000000000
--- a/includes/skins/MediaWikiI18N.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- */
-
-/**
- * Wrapper object for MediaWiki's localization functions,
- * to be passed to the template engine.
- *
- * @private
- * @ingroup Skins
- */
-class MediaWikiI18N {
-	private $context = [];
-
-	/**
-	 * @deprecate since 1.31 Use BaseTemplate::msg() or Skin::msg() instead for setting
-	 *  message parameters.
-	 */
-	function set( $varName, $value ) {
-		wfDeprecated( __METHOD__, '1.31' );
-		$this->context[$varName] = $value;
-	}
-
-	/**
-	 * @deprecate since 1.31 Use BaseTemplate::msg(), Skin::msg(), or wfMessage() instead.
-	 */
-	function translate( $value ) {
-		wfDeprecated( __METHOD__, '1.31' );
-		// Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
-		$value = preg_replace( '/^string:/', '', $value );
-
-		$value = wfMessage( $value )->text();
-		// interpolate variables
-		$m = [];
-		while ( preg_match( '/\$([0-9]*?)/sm', $value, $m ) ) {
-			list( $src, $var ) = $m;
-			Wikimedia\suppressWarnings();
-			$varValue = $this->context[$var];
-			Wikimedia\restoreWarnings();
-			$value = str_replace( $src, $varValue, $value );
-		}
-		return $value;
-	}
-}
diff --git a/includes/skins/QuickTemplate.php b/includes/skins/QuickTemplate.php
index 1886746489..aa20e202eb 100644
--- a/includes/skins/QuickTemplate.php
+++ b/includes/skins/QuickTemplate.php
@@ -31,11 +31,6 @@ abstract class QuickTemplate {
 	 */
 	public $data;
 
-	/**
-	 * @var MediaWikiI18N
-	 */
-	public $translator;
-
 	/** @var Config $config */
 	protected $config;
 
@@ -44,7 +39,6 @@ abstract class QuickTemplate {
 	 */
 	function __construct( Config $config = null ) {
 		$this->data = [];
-		$this->translator = new MediaWikiI18N();
 		if ( $config === null ) {
 			wfDebug( __METHOD__ . ' was called with no Config instance passed to it' );
 			$config = MediaWikiServices::getInstance()->getMainConfig();
@@ -102,16 +96,6 @@ abstract class QuickTemplate {
 		$this->data[$name] =& $value;
 	}
 
-	/**
-	 * @param MediaWikiI18N &$t
-	 * @deprecate since 1.31 Use BaseTemplate::msg() or Skin::msg() instead for setting
-	 *  message parameters.
-	 */
-	public function setTranslator( &$t ) {
-		wfDeprecated( __METHOD__, '1.31' );
-		$this->translator = &$t;
-	}
-
 	/**
 	 * Main function, used by classes that subclass QuickTemplate
 	 * to show the actual HTML output
-- 
2.20.1