From 8b4a4b860f46741b6e1024bb11e94edab8088d68 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Tue, 19 Jun 2018 21:37:17 +0200 Subject: [PATCH] Deprecate string type for $lang of DifferenceEngine::setTextLanguage Also move the comment about the default value from the setter to the getter. Change-Id: I2e1bd29db986dfa92d41a876340a6aa59ac6670d Depends-On: I8b573866c2de9b21d3849f02269c1b9ca4f62aba --- RELEASE-NOTES-1.32 | 1 + includes/diff/DifferenceEngine.php | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32 index d0d5eb2dc1..a269629224 100644 --- a/RELEASE-NOTES-1.32 +++ b/RELEASE-NOTES-1.32 @@ -227,6 +227,7 @@ because of Phabricator reports. * The 'jquery.hidpi' module (polyfill for IMG srcset) is deprecated. * ResourceLoaderStartUpModule::getStartupModules() and ::getLegacyModules() are deprecated. These concepts are obsolete and have no replacement. +* String type for $lang of DifferenceEngine::setTextLanguage is deprecated. === Other changes in 1.32 === * … diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index ff07fe7dd5..a77dab8ce4 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -132,6 +132,8 @@ class DifferenceEngine extends ContextSource { } /** + * Get the language of the difference engine, defaults to page content language + * * @return Language */ public function getDiffLang() { @@ -1343,11 +1345,14 @@ class DifferenceEngine extends ContextSource { /** * Set the language in which the diff text is written - * (Defaults to page content language). - * @param Language|string $lang + * + * @param Language $lang * @since 1.19 */ public function setTextLanguage( $lang ) { + if ( !$lang instanceof Language ) { + wfDeprecated( __METHOD__ . ' with other type than Language for $lang', '1.32' ); + } $this->mDiffLang = wfGetLangObj( $lang ); } -- 2.20.1