From 1ee582b2a867207a95e3e4d3ff11ea814e216cdd Mon Sep 17 00:00:00 2001 From: Reedy Date: Fri, 1 Jun 2018 00:37:07 +0100 Subject: [PATCH] Remove UtfNormal class Change-Id: I1cab16d95ed888b482d23f73577c988700e0bca4 --- RELEASE-NOTES-1.33 | 2 + autoload.php | 1 - includes/compat/normal/UtfNormal.php | 136 --------------------------- 3 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 includes/compat/normal/UtfNormal.php diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33 index 4433ed923e..3e55337fb5 100644 --- a/RELEASE-NOTES-1.33 +++ b/RELEASE-NOTES-1.33 @@ -54,6 +54,8 @@ because of Phabricator reports. The parameters $tooltip and $lang are mandatory. Omitting the parameters is deprecated since 1.32. * Language::truncate(), deprecated in 1.31, has been removed. +* UtfNormal, deprecated in 1.25, was removed. Use UtfNormal\Validator directly + instead. * … === Deprecations in 1.33 === diff --git a/autoload.php b/autoload.php index 3e6b4a20b7..e3ce02c7a6 100644 --- a/autoload.php +++ b/autoload.php @@ -1552,7 +1552,6 @@ $wgAutoloadLocalClasses = [ 'UserRightsProxy' => __DIR__ . '/includes/user/UserRightsProxy.php', 'UserrightsPage' => __DIR__ . '/includes/specials/SpecialUserrights.php', 'UsersPager' => __DIR__ . '/includes/specials/pagers/UsersPager.php', - 'UtfNormal' => __DIR__ . '/includes/compat/normal/UtfNormal.php', 'UzConverter' => __DIR__ . '/languages/classes/LanguageUz.php', 'VFormHTMLForm' => __DIR__ . '/includes/htmlform/VFormHTMLForm.php', 'ValidateRegistrationFile' => __DIR__ . '/maintenance/validateRegistrationFile.php', diff --git a/includes/compat/normal/UtfNormal.php b/includes/compat/normal/UtfNormal.php deleted file mode 100644 index bce1ea602f..0000000000 --- a/includes/compat/normal/UtfNormal.php +++ /dev/null @@ -1,136 +0,0 @@ - - * https://www.mediawiki.org/ - * - * 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 - * @ingroup UtfNormal - */ - -/** - * @defgroup UtfNormal UtfNormal - */ - -use UtfNormal\Validator; - -/** - * Unicode normalization routines for working with UTF-8 strings. - * Currently assumes that input strings are valid UTF-8! - * - * Not as fast as I'd like, but should be usable for most purposes. - * UtfNormal::toNFC() will bail early if given ASCII text or text - * it can quickly determine is already normalized. - * - * All functions can be called static. - * - * See description of forms at https://www.unicode.org/reports/tr15/ - * - * @deprecated since 1.25, use UtfNormal\Validator directly - * @ingroup UtfNormal - */ -class UtfNormal { - /** - * The ultimate convenience function! Clean up invalid UTF-8 sequences, - * and convert to normal form C, canonical composition. - * - * Fast return for pure ASCII strings; some lesser optimizations for - * strings containing only known-good characters. Not as fast as toNFC(). - * - * @param string $string a UTF-8 string - * @return string a clean, shiny, normalized UTF-8 string - */ - static function cleanUp( $string ) { - wfDeprecated( __METHOD__, '1.25' ); - return Validator::cleanUp( $string ); - } - - /** - * Convert a UTF-8 string to normal form C, canonical composition. - * Fast return for pure ASCII strings; some lesser optimizations for - * strings containing only known-good characters. - * - * @param string $string a valid UTF-8 string. Input is not validated. - * @return string a UTF-8 string in normal form C - */ - static function toNFC( $string ) { - wfDeprecated( __METHOD__, '1.25' ); - return Validator::toNFC( $string ); - } - - /** - * Convert a UTF-8 string to normal form D, canonical decomposition. - * Fast return for pure ASCII strings. - * - * @param string $string a valid UTF-8 string. Input is not validated. - * @return string a UTF-8 string in normal form D - */ - static function toNFD( $string ) { - wfDeprecated( __METHOD__, '1.25' ); - return Validator::toNFD( $string ); - } - - /** - * Convert a UTF-8 string to normal form KC, compatibility composition. - * This may cause irreversible information loss, use judiciously. - * Fast return for pure ASCII strings. - * - * @param string $string a valid UTF-8 string. Input is not validated. - * @return string a UTF-8 string in normal form KC - */ - static function toNFKC( $string ) { - wfDeprecated( __METHOD__, '1.25' ); - return Validator::toNFKC( $string ); - } - - /** - * Convert a UTF-8 string to normal form KD, compatibility decomposition. - * This may cause irreversible information loss, use judiciously. - * Fast return for pure ASCII strings. - * - * @param string $string a valid UTF-8 string. Input is not validated. - * @return string a UTF-8 string in normal form KD - */ - static function toNFKD( $string ) { - wfDeprecated( __METHOD__, '1.25' ); - return Validator::toNFKD( $string ); - } - - /** - * Returns true if the string is _definitely_ in NFC. - * Returns false if not or uncertain. - * @param string $string a valid UTF-8 string. Input is not validated. - * @return bool - */ - static function quickIsNFC( $string ) { - wfDeprecated( __METHOD__, '1.25' ); - return Validator::quickIsNFC( $string ); - } - - /** - * Returns true if the string is _definitely_ in NFC. - * Returns false if not or uncertain. - * @param string &$string a UTF-8 string, altered on output to be valid UTF-8 safe for XML. - * @return bool - */ - static function quickIsNFCVerify( &$string ) { - wfDeprecated( __METHOD__, '1.25' ); - return Validator::quickIsNFCVerify( $string ); - } -} -- 2.20.1