From e4bcb8f050edd4b1eabe1f12a2ae2cb8c87386ba Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Wed, 16 Feb 2022 18:26:10 +0000
Subject: [PATCH] Remove SkinMinervaNeue alias

Bug: T301811
Change-Id: I71c02347e43f9e4744fb1aa0c6c8e24ab0790f16
---
 includes/Skins/SkinMinerva.php | 3 ---
 skin.json                      | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/includes/Skins/SkinMinerva.php b/includes/Skins/SkinMinerva.php
index f6711d456..c0d28c456 100644
--- a/includes/Skins/SkinMinerva.php
+++ b/includes/Skins/SkinMinerva.php
@@ -940,6 +940,3 @@ class SkinMinerva extends SkinMustache {
 		return $styles;
 	}
 }
-
-// Setup alias for compatibility with SkinMinervaNeue.
-class_alias( 'SkinMinerva', 'SkinMinervaNeue' );
diff --git a/skin.json b/skin.json
index 8c1c6a4aa..fba981ca9 100644
--- a/skin.json
+++ b/skin.json
@@ -98,7 +98,7 @@
 	},
 	"ValidSkinNames": {
 		"minerva": {
-			"class": "SkinMinervaNeue",
+			"class": "SkinMinerva",
 			"args": [ {
 				"name": "minerva",
 				"templateDirectory": "includes/Skins",
@@ -125,8 +125,7 @@
 	"AutoloadClasses": {
 		"MinervaUI": "includes/MinervaUI.php",
 		"MinervaHooks": "includes/MinervaHooks.php",
-		"SkinMinerva": "includes/Skins/SkinMinerva.php",
-		"SkinMinervaNeue": "includes/Skins/SkinMinerva.php"
+		"SkinMinerva": "includes/Skins/SkinMinerva.php"
 	},
 	"ConfigRegistry": {
 		"minerva": "GlobalVarConfig::newInstance"