Remove $wgFixArabicUnicode and $wgFixMalayalamUnicode

Bug: T241352
Bug: T241353
Change-Id: Idefd5624d761fad4a6c3cca950ce1038a4dec770

RELEASE-NOTES-1.35

@@ -75,6 +75,8 @@ For notes on 1.34.x and older releases, see HISTORY.
   skin from being shown, use $wgSkipSkins.
 * $wgMaxGeneratedPPNodeCount - This setting was removed.  It only affected
   Preprocessor_DOM, which was deprecated in 1.34 and removed in this release.
+* $wgFixArabicUnicode and $wgFixMalayalamUnicode, deprecated in 1.33, were
+  removed. The fixes are now always enabled for their respective languages.
 * …
 
 === New user-facing features in 1.35 ===

includes/DefaultSettings.php

@@ -3073,39 +3073,11 @@ $wgExtraLanguageCodes = [
  */
 $wgDummyLanguageCodes = [];
 
-/**
- * Set this to true to replace Arabic presentation forms with their standard
- * forms in the U+0600-U+06FF block. This only works if $wgLanguageCode is
- * set to "ar".
- *
- * 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;
-
-/**
- * Set this to true to replace ZWJ-based chillu sequences in Malayalam text
- * with their Unicode 5.1 equivalents. This only works if $wgLanguageCode is
- * set to "ml". Note that some clients (even new clients as of 2010) do not
- * support these characters.
- *
- * 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;
-
 /**
  * Set this to always convert certain Unicode sequences to modern ones
  * regardless of the content language. This has a small performance
  * impact.
  *
- * See $wgFixArabicUnicode and $wgFixMalayalamUnicode for conversion
- * details.
- *
  * @since 1.17
  */
 $wgAllUnicodeFixes = false;

includes/api/ApiQuerySiteinfo.php

@@ -181,8 +181,8 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 		$data['invalidusernamechars'] = $config->get( 'InvalidUsernameCharacters' );
 
 		$data['allunicodefixes'] = (bool)$config->get( 'AllUnicodeFixes' );
-		$data['fixarabicunicode'] = (bool)$config->get( 'FixArabicUnicode' );
-		$data['fixmalayalamunicode'] = (bool)$config->get( 'FixMalayalamUnicode' );
+		$data['fixarabicunicode'] = true; // Config removed in 1.35, always true
+		$data['fixmalayalamunicode'] = true; // Config removed in 1.35, always true
 
 		global $IP;
 		$git = SpecialVersion::getGitHeadSha1( $IP );

languages/classes/LanguageAr.php

@@ -41,13 +41,8 @@ class LanguageAr extends Language {
 	 * @return string
 	 */
 	public function normalize( $s ) {
-		global $wgFixArabicUnicode;
 		$s = parent::normalize( $s );
-		if ( $wgFixArabicUnicode ) {
-			$s = $this->transformUsingPairFile( 'normalize-ar.php', $s );
-		} else {
-			wfDeprecated( '$wgFixArabicUnicode = false', '1.33' );
-		}
+		$s = $this->transformUsingPairFile( 'normalize-ar.php', $s );
 		return $s;
 	}
 }

languages/classes/LanguageMl.php

@@ -42,13 +42,8 @@ class LanguageMl extends Language {
 	 * @return string
 	 */
 	public function normalize( $s ) {
-		global $wgFixMalayalamUnicode;
 		$s = parent::normalize( $s );
-		if ( $wgFixMalayalamUnicode ) {
-			$s = $this->transformUsingPairFile( 'normalize-ml.php', $s );
-		} else {
-			wfDeprecated( '$wgFixMalayalamUnicode = false', '1.33' );
-		}
+		$s = $this->transformUsingPairFile( 'normalize-ml.php', $s );
 		return $s;
 	}
 }

tests/phpunit/languages/classes/LanguageArTest.php

@@ -30,12 +30,7 @@ class LanguageArTest extends LanguageClassesTestCase {
 			throw new Exception( 'Expected output must differ.' );
 		}
 
-		$this->setMwGlobals( 'wgFixArabicUnicode', true );
 		$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' );
 	}
 
 	public static function provideNormalize() {

tests/phpunit/languages/classes/LanguageMlTest.php

@@ -49,12 +49,7 @@ class LanguageMlTest extends LanguageClassesTestCase {
 			throw new Exception( 'Expected output must differ.' );
 		}
 
-		$this->setMwGlobals( 'wgFixMalayalamUnicode', true );
 		$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' );
 	}
 
 	public static function provideNormalize() {