From 166d09893ba8e962051d763102221387d5ad5fea Mon Sep 17 00:00:00 2001
From: Derick Alangi <alangiderick@gmail.com>
Date: Sat, 23 Feb 2019 18:38:51 +0100
Subject: [PATCH] languages: Hard deprecate Language::getExtraUserToggles()
 method

This seems to be still used internally in core but in no extension. Also,
this function really doesn't do anything so hard deprecating in preparation
for removal.

Bug: T62260
Change-Id: I568789483084a97e5b3b462235f3d00c3cb87cf9
---
 RELEASE-NOTES-1.34                            |  3 +++
 .../cache/localisation/LocalisationCache.php  | 19 ++++++++++---------
 .../preferences/DefaultPreferencesFactory.php | 12 ------------
 languages/Language.php                        |  3 ++-
 languages/messages/MessagesEn.php             |  7 -------
 5 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 197d9830fc..67e9963b00 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -220,6 +220,9 @@ because of Phabricator reports.
 * Constructing Parser directly is deprecated. Obtain one from ParserFactory.
 * Title::moveSubpages is deprecated. Use MovePage::moveSubpages or
   MovePage::moveSubpagesIfAllowed.
+* The MWNamespace class is deprecated. Use MediaWikiServices::getNamespaceInfo.
+* (T62260) Hard deprecate Language::getExtraUserToggles() method.
+* …
 
 === Other changes in 1.34 ===
 * …
diff --git a/includes/cache/localisation/LocalisationCache.php b/includes/cache/localisation/LocalisationCache.php
index 788eec345e..bb84f97289 100644
--- a/includes/cache/localisation/LocalisationCache.php
+++ b/includes/cache/localisation/LocalisationCache.php
@@ -108,14 +108,15 @@ class LocalisationCache {
 	 */
 	public static $allKeys = [
 		'fallback', 'namespaceNames', 'bookstoreList',
-		'magicWords', 'messages', 'rtl', 'capitalizeAllNouns', 'digitTransformTable',
-		'separatorTransformTable', 'minimumGroupingDigits',
-		'fallback8bitEncoding', 'linkPrefixExtension',
-		'linkTrail', 'linkPrefixCharset', 'namespaceAliases',
-		'dateFormats', 'datePreferences', 'datePreferenceMigrationMap',
-		'defaultDateFormat', 'extraUserToggles', 'specialPageAliases',
-		'imageFiles', 'preloadedMessages', 'namespaceGenderAliases',
-		'digitGroupingPattern', 'pluralRules', 'pluralRuleTypes', 'compiledPluralRules',
+		'magicWords', 'messages', 'rtl', 'capitalizeAllNouns',
+		'digitTransformTable', 'separatorTransformTable',
+		'minimumGroupingDigits', 'fallback8bitEncoding',
+		'linkPrefixExtension', 'linkTrail', 'linkPrefixCharset',
+		'namespaceAliases', 'dateFormats', 'datePreferences',
+		'datePreferenceMigrationMap', 'defaultDateFormat',
+		'specialPageAliases', 'imageFiles', 'preloadedMessages',
+		'namespaceGenderAliases', 'digitGroupingPattern', 'pluralRules',
+		'pluralRuleTypes', 'compiledPluralRules',
 	];
 
 	/**
@@ -129,7 +130,7 @@ class LocalisationCache {
 	/**
 	 * Keys for items which are a numbered array.
 	 */
-	public static $mergeableListKeys = [ 'extraUserToggles' ];
+	public static $mergeableListKeys = [];
 
 	/**
 	 * Keys for items which contain an array of arrays of equivalent aliases
diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index b18088f481..1ba6d99429 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -496,18 +496,6 @@ class DefaultPreferencesFactory implements PreferencesFactory {
 			}
 		}
 
-		// Stuff from Language::getExtraUserToggles()
-		// FIXME is this dead code? $extraUserToggles doesn't seem to be defined for any language
-		$toggles = $this->contLang->getExtraUserToggles();
-
-		foreach ( $toggles as $toggle ) {
-			$defaultPreferences[$toggle] = [
-				'type' => 'toggle',
-				'section' => 'personal/i18n',
-				'label-message' => "tog-$toggle",
-			];
-		}
-
 		// show a preview of the old signature first
 		$oldsigWikiText = MediaWikiServices::getInstance()->getParser()->preSaveTransform(
 			'~~~',
diff --git a/languages/Language.php b/languages/Language.php
index 2262fa775e..6c8b19ed80 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -814,7 +814,8 @@ class Language {
 	 * @return array
 	 */
 	public function getExtraUserToggles() {
-		return (array)self::$dataCache->getItem( $this->mCode, 'extraUserToggles' );
+		wfDeprecated( __METHOD__, '1.34' );
+		return [];
 	}
 
 	/**
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d0115ea770..666b28f82e 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -37,13 +37,6 @@ $digitTransformTable = null;
  */
 $separatorTransformTable = null;
 
-/**
- * Extra user preferences, which will be shown in Special:Preferences as
- * checkboxes. Extra settings in derived languages will automatically be
- * appended to the array of the fallback languages.
- */
-$extraUserToggles = [];
-
 /**
  * URLs do not specify their encoding. UTF-8 is used by default, but if the
  * URL is not a valid UTF-8 sequence, we have to try to guess what the real
-- 
2.20.1