From: Reedy <reedy@wikimedia.org>
Date: Wed, 30 Nov 2016 00:38:00 +0000 (+0000)
Subject: Removed Xml::escapeJsString()
X-Git-Tag: 1.31.0-rc.0~4688
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=7ae2669643beb2531eb61d9603e66b3da561cb2a;p=lhc%2Fweb%2Fwiklou.git

Removed Xml::escapeJsString()

Change-Id: Iead8385a72a79632a90594a8828080a6d572e039
---

diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index ef353ed3c8..98d2a172c1 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -59,6 +59,7 @@ changes to languages because of Phabricator reports.
 * MWHttpRequest::execute() should be considered to return a StatusValue; the
   Status return type is deprecated.
 * User::edits() (deprecated in 1.21) was removed.
+* Xml::escapeJsString() (deprecated in 1.21) was removed.
 
 == Compatibility ==
 
diff --git a/includes/Xml.php b/includes/Xml.php
index 4c6b0715b0..e124c38b75 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -613,42 +613,6 @@ class Xml {
 					$content, false );
 	}
 
-	/**
-	 * Returns an escaped string suitable for inclusion in a string literal
-	 * for JavaScript source code.
-	 * Illegal control characters are assumed not to be present.
-	 *
-	 * @deprecated since 1.21; use Xml::encodeJsVar() or Xml::encodeJsCall() instead
-	 * @param string $string String to escape
-	 * @return string
-	 */
-	public static function escapeJsString( $string ) {
-		// See ECMA 262 section 7.8.4 for string literal format
-		$pairs = [
-			"\\" => "\\\\",
-			"\"" => "\\\"",
-			'\'' => '\\\'',
-			"\n" => "\\n",
-			"\r" => "\\r",
-
-			# To avoid closing the element or CDATA section
-			"<" => "\\x3c",
-			">" => "\\x3e",
-
-			# To avoid any complaints about bad entity refs
-			"&" => "\\x26",
-
-			# Work around https://bugzilla.mozilla.org/show_bug.cgi?id=274152
-			# Encode certain Unicode formatting chars so affected
-			# versions of Gecko don't misinterpret our strings;
-			# this is a common problem with Farsi text.
-			"\xe2\x80\x8c" => "\\u200c", // ZERO WIDTH NON-JOINER
-			"\xe2\x80\x8d" => "\\u200d", // ZERO WIDTH JOINER
-		];
-
-		return strtr( $string, $pairs );
-	}
-
 	/**
 	 * Encode a variable of arbitrary type to JavaScript.
 	 * If the value is an XmlJsCode object, pass through the object's value verbatim.
diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index dbd1299ebd..18ff1f4b11 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -305,17 +305,6 @@ class XmlTest extends MediaWikiTestCase {
 		);
 	}
 
-	/**
-	 * @covers Xml::escapeJsString
-	 */
-	public function testEscapeJsStringSpecialChars() {
-		$this->assertEquals(
-			'\\\\\r\n',
-			Xml::escapeJsString( "\\\r\n" ),
-			'escapeJsString() with special characters'
-		);
-	}
-
 	/**
 	 * @covers Xml::encodeJsVar
 	 */