Drop support for MediaWiki 1.31 and earlier

MediaWiki 1.33 is released. The next version MLEB 2019.07 will be
compatible with MediaWiki 1.32 and 1.33.

Change-Id: I9487706125fe84d02cb8d3fec0a10e1f10006e64

extension.json

@@ -17,7 +17,7 @@
 	"descriptionmsg": "uls-desc",
 	"license-name": "GPL-2.0-or-later",
 	"requires": {
-		"MediaWiki": ">= 1.30.0"
+		"MediaWiki": ">= 1.32.0"
 	},
 	"Hooks": {
 		"BeforePageDisplay": "UniversalLanguageSelectorHooks::addModules",
@@ -28,7 +28,6 @@
 		"MakeGlobalVariablesScript": "UniversalLanguageSelectorHooks::addVariables",
 		"PersonalUrls": "UniversalLanguageSelectorHooks::addPersonalBarTrigger",
 		"ResourceLoaderGetConfigVars": "UniversalLanguageSelectorHooks::addConfig",
-		"ResourceLoaderRegisterModules": "UniversalLanguageSelectorHooks::onResourceLoaderRegisterModules",
 		"ResourceLoaderTestModules": "UniversalLanguageSelectorHooks::addTestModules",
 		"SkinTemplateOutputPageBeforeExec": "UniversalLanguageSelectorHooks::onSkinTemplateOutputPageBeforeExec",
 		"UserGetLanguageObject": "UniversalLanguageSelectorHooks::getLanguage"
@@ -146,6 +145,21 @@
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
+		"ext.uls.displaysettings": {
+			"scripts": "js/ext.uls.displaysettings.js",
+			"styles": "css/ext.uls.displaysettings.less",
+			"dependencies": [
+				"ext.uls.languagesettings",
+				"ext.uls.mediawiki",
+				"ext.uls.webfonts",
+				"mediawiki.api",
+				"mediawiki.ui.checkbox",
+				"mediawiki.ui.button",
+				"mediawiki.user"
+			],
+			"localBasePath": "resources",
+			"remoteExtPath": "UniversalLanguageSelector/resources"
+		},
 		"ext.uls.geoclient": {
 			"scripts": "js/ext.uls.geoclient.js",
 			"dependencies": [
@@ -257,6 +271,15 @@
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
+		"ext.uls.preferences": {
+			"scripts": "js/ext.uls.preferences.js",
+			"dependencies": [
+				"mediawiki.user",
+				"mediawiki.api"
+			],
+			"localBasePath": "resources",
+			"remoteExtPath": "UniversalLanguageSelector/resources"
+		},
 		"ext.uls.preferencespage": {
 			"styles": "css/ext.uls.preferencespage.less",
 			"localBasePath": "resources",

includes/UniversalLanguageSelectorHooks.php

@@ -461,46 +461,4 @@ class UniversalLanguageSelectorHooks {
 			$context->getOutput()->addModules( 'ext.uls.webfonts.mobile' );
 		}
 	}
-
-	/**
-	 * Conditionally register modules.
-	 *
-	 * @param ResourceLoader $resourceLoader
-	 */
-	public static function onResourceLoaderRegisterModules( ResourceLoader $resourceLoader ) {
-		global $wgVersion;
-
-		$modules = [];
-		$modules['ext.uls.displaysettings'] = [
-			'scripts' => 'js/ext.uls.displaysettings.js',
-			'styles' => 'css/ext.uls.displaysettings.less',
-			'dependencies' => [
-				'ext.uls.languagesettings',
-				'ext.uls.mediawiki',
-				'ext.uls.webfonts',
-				'mediawiki.api',
-				'mediawiki.ui.checkbox',
-				'mediawiki.ui.button',
-				'mediawiki.user'
-			],
-			'localBasePath' => __DIR__ . '/../resources',
-			'remoteExtPath' => 'UniversalLanguageSelector/resources'
-		];
-		$modules['ext.uls.preferences'] = [
-			'scripts' => 'js/ext.uls.preferences.js',
-			'dependencies' => [
-				'mediawiki.user',
-				'mediawiki.api'
-			],
-			'localBasePath' => __DIR__ . '/../resources',
-			'remoteExtPath' => 'UniversalLanguageSelector/resources'
-		];
-		if ( version_compare( $wgVersion, '1.32', '<' ) ) {
-			// Support: MediaWiki 1.31 and earlier (T200168)
-			$modules['ext.uls.displaysettings']['dependencies'][] = 'mediawiki.api.parse';
-			$modules['ext.uls.preferences']['dependencies'][] = 'mediawiki.api.options';
-		}
-
-		$resourceLoader->register( $modules );
-	}
 }