From 103a4f76dca2ef45158e3420a81fe6b6bfb10efb Mon Sep 17 00:00:00 2001
From: "C. Scott Ananian" <cscott@cscott.net>
Date: Fri, 19 Oct 2018 11:06:15 -0400
Subject: [PATCH] Deprecate $wgFixArabicUnicode / $wgFixMalayalamUnicode

These were introduced in MW 1.17 and are always true in production.

They were useful to allow folks to defer title conversion, but it's
been a long time now.  We don't need to make this optional any more.

Change-Id: I65dcfe80dc3e1dfeb4d63924a8928655e012a20c
---
 RELEASE-NOTES-1.33                                 | 5 +++++
 includes/DefaultSettings.php                       | 4 ++++
 languages/classes/LanguageAr.php                   | 2 ++
 languages/classes/LanguageMl.php                   | 2 ++
 tests/phpunit/languages/classes/LanguageArTest.php | 1 +
 tests/phpunit/languages/classes/LanguageMlTest.php | 1 +
 6 files changed, 15 insertions(+)

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 5da6863639..91b53fbaeb 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -60,6 +60,11 @@ because of Phabricator reports.
   to be removed in a future release.
 * The configuration option $wgSquidPurgeUseHostHeader has been deprecated,
   and is expected to be removed in a future release.
+* The configuration options $wgFixArabicUnicode and $wgFixMalayalamUnicode,
+  introduced in MW 1.17, have been deprecated.  These fixes will always be
+  applied for Arabic and Malayalam in the future.  Please enable these on
+  your local wiki (if you have them explicitly set to false) and run
+  maintenance/cleanupTitles.php to fix any existing page titles.
 * …
 
 === Other changes in 1.33 ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index fa95633ffd..97f25c1375 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3019,6 +3019,8 @@ $wgDummyLanguageCodes = [];
  *
  * Note that pages with titles containing presentation forms will become
  * inaccessible, run maintenance/cleanupTitles.php to fix this.
+ *
+ * @deprecated since 1.33: in the future will always be true.
  */
 $wgFixArabicUnicode = true;
 
@@ -3030,6 +3032,8 @@ $wgFixArabicUnicode = true;
  *
  * If you enable this on an existing wiki, run maintenance/cleanupTitles.php to
  * fix any ZWJ sequences in existing page titles.
+ *
+ * @deprecated since 1.33: in the future will always be true.
  */
 $wgFixMalayalamUnicode = true;
 
diff --git a/languages/classes/LanguageAr.php b/languages/classes/LanguageAr.php
index f2ce1788e3..24b5e6c5ce 100644
--- a/languages/classes/LanguageAr.php
+++ b/languages/classes/LanguageAr.php
@@ -45,6 +45,8 @@ class LanguageAr extends Language {
 		$s = parent::normalize( $s );
 		if ( $wgFixArabicUnicode ) {
 			$s = $this->transformUsingPairFile( 'normalize-ar.php', $s );
+		} else {
+			wfDeprecated( '$wgFixArabicUnicode = false', '1.33' );
 		}
 		return $s;
 	}
diff --git a/languages/classes/LanguageMl.php b/languages/classes/LanguageMl.php
index 176c64c135..3dd0d37ebf 100644
--- a/languages/classes/LanguageMl.php
+++ b/languages/classes/LanguageMl.php
@@ -46,6 +46,8 @@ class LanguageMl extends Language {
 		$s = parent::normalize( $s );
 		if ( $wgFixMalayalamUnicode ) {
 			$s = $this->transformUsingPairFile( 'normalize-ml.php', $s );
+		} else {
+			wfDeprecated( '$wgFixMalayalamUnicode = false', '1.33' );
 		}
 		return $s;
 	}
diff --git a/tests/phpunit/languages/classes/LanguageArTest.php b/tests/phpunit/languages/classes/LanguageArTest.php
index 296ee60788..c7ff3bb972 100644
--- a/tests/phpunit/languages/classes/LanguageArTest.php
+++ b/tests/phpunit/languages/classes/LanguageArTest.php
@@ -34,6 +34,7 @@ class LanguageArTest extends LanguageClassesTestCase {
 		$this->assertSame( $expected, $this->getLang()->normalize( $input ), 'ar-normalised form' );
 
 		$this->setMwGlobals( 'wgFixArabicUnicode', false );
+		$this->hideDeprecated( '$wgFixArabicUnicode = false' );
 		$this->assertSame( $input, $this->getLang()->normalize( $input ), 'regular normalised form' );
 	}
 
diff --git a/tests/phpunit/languages/classes/LanguageMlTest.php b/tests/phpunit/languages/classes/LanguageMlTest.php
index 59b7ba8d98..f5b33e9dab 100644
--- a/tests/phpunit/languages/classes/LanguageMlTest.php
+++ b/tests/phpunit/languages/classes/LanguageMlTest.php
@@ -52,6 +52,7 @@ class LanguageMlTest extends LanguageClassesTestCase {
 		$this->assertSame( $expected, $this->getLang()->normalize( $input ), 'ml-normalised form' );
 
 		$this->setMwGlobals( 'wgFixMalayalamUnicode', false );
+		$this->hideDeprecated( '$wgFixMalayalamUnicode = false' );
 		$this->assertSame( $input, $this->getLang()->normalize( $input ), 'regular normalised form' );
 	}
 
-- 
2.20.1