From b2a1a180087768674d70472cacf9349f85d21c1c Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Tue, 30 Apr 2019 00:12:58 +0100 Subject: [PATCH 1/1] Language: Remove deprecated initEncoding(), recodeForEdit() & recodeInput() Language::initEncoding(), ::recodeForEdit(), and ::recodeInput() deprecated in 1.28 are now removed. Usage ===== * initEncoding() - https://codesearch.wmflabs.org/search/?q=initEncoding&i=nope&files=&repos= * recodeForEdit() - https://codesearch.wmflabs.org/search/?q=recodeForEdit&i=nope&files=&repos= * recodeInput() - https://codesearch.wmflabs.org/search/?q=recodeInput&i=nope&files=&repos= Bug: T220656 Change-Id: I309ec5eebbdddd3b71541c446b15b15204abf8ca --- RELEASE-NOTES-1.34 | 2 ++ languages/Language.php | 28 ---------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index a779e6f6d8..7a10b7e1ae 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -139,6 +139,8 @@ because of Phabricator reports. been removed. Use ->msg() or ->getMsg() instead. * WatchAction::getUnwatchToken(), deprecated in 1.32, has been removed. Instead, use WatchAction::getWatchToken() with action 'unwatch' directly. +* Language::initEncoding(), ::recodeForEdit(), and recodeInput(), deprecated in + 1.28, have been removed. * … === Deprecations in 1.34 === diff --git a/languages/Language.php b/languages/Language.php index 7b89a9c29f..3a12439e6e 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -3033,34 +3033,6 @@ class Language { } } - /** - * @deprecated No-op since 1.28 - */ - function initEncoding() { - wfDeprecated( __METHOD__, '1.28' ); - // No-op. - } - - /** - * @param string $s - * @return string - * @deprecated No-op since 1.28 - */ - function recodeForEdit( $s ) { - wfDeprecated( __METHOD__, '1.28' ); - return $s; - } - - /** - * @param string $s - * @return string - * @deprecated No-op since 1.28 - */ - function recodeInput( $s ) { - wfDeprecated( __METHOD__, '1.28' ); - return $s; - } - /** * Convert a UTF-8 string to normal form C. In Malayalam and Arabic, this * also cleans up certain backwards-compatible sequences, converting them -- 2.20.1