Merge "skins: Deprecate QuickTemplate::setTranslator and MediaWikiI18N::set"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index e8b4422..ba7b86c 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -194,6 +194,8 @@ changes to languages because of Phabricator reports.
   Setting template variables by reference allowed violating the principle of data being
   immutable once added to the skin template. In practice, this method was not being
   used for that. Rather, setRef() existed as memory optimisation for PHP 4.
+* QuickTemplate::setTranslator() was deprecated in favour of Skin::msg() parameters.
+* MediaWikiI18N::set() was deprecated in favour of Skin::msg() parameters.
 * Passing false to ParserOptions::setWrapOutputClass() is deprecated. Use the
   'unwrap' transform to ParserOutput::getText() instead.
 * ParserOutput objects generated using a non-default value for

diff --git a/includes/skins/MediaWikiI18N.php b/includes/skins/MediaWikiI18N.php
index 7fcdb3c..eeedaad 100644 (file)
--- a/includes/skins/MediaWikiI18N.php
+++ b/includes/skins/MediaWikiI18N.php
@@ -28,7 +28,12 @@
 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;
        }
 

diff --git a/includes/skins/QuickTemplate.php b/includes/skins/QuickTemplate.php
index 19b41ba..7782e70 100644 (file)
--- a/includes/skins/QuickTemplate.php
+++ b/includes/skins/QuickTemplate.php
@@ -104,8 +104,11 @@ abstract class QuickTemplate {
 
        /**
         * @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;
        }