From 59502c9ae7ff889b8d82786fd6a791f9a069ea99 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Tue, 19 Jun 2018 21:48:40 +0200 Subject: [PATCH] Force type Language for $lang of DifferenceEngine::setTextLanguage Change-Id: I77e7116f81072fa42f580552e7b94323cfe31856 --- RELEASE-NOTES-1.33 | 2 ++ includes/diff/DifferenceEngine.php | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index 37f282deaa..7580d300da 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -47,6 +47,8 @@ because of Phabricator reports. * … === Breaking changes in 1.33 === +* The parameteter $lang in DifferenceEngine::setTextLanguage must be of type + Language. Other types are deprecated since 1.32. * … === Deprecations in 1.33 === diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index f8f3d1cfc0..8d0971e659 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -1665,11 +1665,8 @@ class DifferenceEngine extends ContextSource { * @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 ); + public function setTextLanguage( Language $lang ) { + $this->mDiffLang = $lang; } /** -- 2.20.1