From d2a7f802cfbd62e939c2a454c13087a27bd4c261 Mon Sep 17 00:00:00 2001
From: Derick Alangi <alangiderick@gmail.com>
Date: Wed, 8 May 2019 20:33:51 +0100
Subject: [PATCH] EditPage: Remove `::safeUnicodeInput()` and
 `::safeUnicodeOutput()`

These methods were deprecated in 1.30 are now being removed as there
are no longer any usage of them.

Usage
=====

https://codesearch.wmflabs.org/search/?q=%5Cb(safeUnicodeOutput%7CsafeUnicodeInput)%5Cb&i=nope&files=&repos=

Bug: T220656
Change-Id: Idd36a81593b9e4e48a43c497c620c3f7d0b0554b
---
 RELEASE-NOTES-1.34    |  4 +++-
 includes/EditPage.php | 27 ---------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index e5e95d24e8..e1e769daa1 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -121,7 +121,9 @@ because of Phabricator reports.
   UserGroupMembership::getLink() instead.
 * SavepointPostgres, deprecated in 1.31, has been removed.
 * Output::sectionEditLinksEnabled(), ParserOutput::getEditSectionTokens,
-  ::getTOCEnabled, ::setEditSectionTokens, ::setTOCEnabled, deprecated in 1.31
+  ::getTOCEnabled, ::setEditSectionTokens, ::setTOCEnabled, deprecated in 1.31,
+  have been removed.
+* EditPage::safeUnicodeInput() and ::safeUnicodeOutput(), deprecated in 1.30,
   have been removed.
 * …
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 2d5b9e20b5..b2044e229f 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4360,33 +4360,6 @@ ERROR;
 		$out->addReturnTo( $this->getContextTitle(), [ 'action' => 'edit' ] );
 	}
 
-	/**
-	 * Filter an input field through a Unicode de-armoring process if it
-	 * came from an old browser with known broken Unicode editing issues.
-	 *
-	 * @deprecated since 1.30, does nothing
-	 *
-	 * @param WebRequest $request
-	 * @param string $field
-	 * @return string
-	 */
-	protected function safeUnicodeInput( $request, $field ) {
-		return rtrim( $request->getText( $field ) );
-	}
-
-	/**
-	 * Filter an output field through a Unicode armoring process if it is
-	 * going to an old browser with known broken Unicode editing issues.
-	 *
-	 * @deprecated since 1.30, does nothing
-	 *
-	 * @param string $text
-	 * @return string
-	 */
-	protected function safeUnicodeOutput( $text ) {
-		return $text;
-	}
-
 	/**
 	 * @since 1.29
 	 */
-- 
2.20.1