From 6419c847e95867fc0ac63d338932de47c62fe2ab Mon Sep 17 00:00:00 2001
From: gerritbot <ladsgroup+gerritbot@gmail.com>
Date: Wed, 29 Nov 2023 12:41:59 +0000
Subject: [PATCH] Update UserOptionsLookup's FQN

User-options related classes are being moved to the MediaWiki\User\Options namespace in MediaWiki Core; reflect that change here.

Bug: T352284
Depends-On: I9822eb1553870b876d0b8a927e4e86c27d83bd52
Change-Id: I5a540772aafd2c4686e02f748b5fc61155920397
---
 includes/Menu/Definitions.php |  2 +-
 skin.json                     | 56 ++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/includes/Menu/Definitions.php b/includes/Menu/Definitions.php
index d16fc7dfe..79026bd41 100644
--- a/includes/Menu/Definitions.php
+++ b/includes/Menu/Definitions.php
@@ -25,8 +25,8 @@ use MediaWiki\Minerva\Menu\Entries\AuthMenuEntry;
 use MediaWiki\Minerva\Menu\Entries\SingleMenuEntry;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Title\Title;
+use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\UserIdentity;
-use MediaWiki\User\UserOptionsLookup;
 use Message;
 use SpecialPage;
 
diff --git a/skin.json b/skin.json
index b3daecb8a..0be077dee 100644
--- a/skin.json
+++ b/skin.json
@@ -22,7 +22,7 @@
 	"url": "https://www.mediawiki.org/wiki/Skin:MinervaNeue",
 	"license-name": "GPL-2.0-or-later",
 	"requires": {
-		"MediaWiki": ">= 1.41"
+		"MediaWiki": ">= 1.42.0"
 	},
 	"config": {
 		"MinervaDonateLink": {
@@ -100,34 +100,36 @@
 	"ValidSkinNames": {
 		"minerva": {
 			"class": "MediaWiki\\Minerva\\Skins\\SkinMinerva",
-			"args": [ {
-				"name": "minerva",
-				"templateDirectory": "includes/Skins",
-				"templateSectionLinks": "SectionLinks",
-				"tempUserBanner": true,
-				"messages": [
-					"variants",
-					"mobile-frontend-languages-not-available",
-					"minerva-page-actions-language-switcher",
-					"sitetitle",
-					"mainpage",
-					"searchbutton",
-					"minerva-user-navigation",
-					"mobile-frontend-main-menu-button-tooltip",
-					"mobile-frontend-footer-sitename"
-				],
-				"menus": [
-					"notifications",
-					"associated-pages"
-				],
-				"clientPrefEnabled": true,
-				"responsive": true,
-				"link": {
-					"text-wrapper": {
-						"tag": "span"
+			"args": [
+				{
+					"name": "minerva",
+					"templateDirectory": "includes/Skins",
+					"templateSectionLinks": "SectionLinks",
+					"tempUserBanner": true,
+					"messages": [
+						"variants",
+						"mobile-frontend-languages-not-available",
+						"minerva-page-actions-language-switcher",
+						"sitetitle",
+						"mainpage",
+						"searchbutton",
+						"minerva-user-navigation",
+						"mobile-frontend-main-menu-button-tooltip",
+						"mobile-frontend-footer-sitename"
+					],
+					"menus": [
+						"notifications",
+						"associated-pages"
+					],
+					"clientPrefEnabled": true,
+					"responsive": true,
+					"link": {
+						"text-wrapper": {
+							"tag": "span"
+						}
 					}
 				}
-			} ]
+			]
 		}
 	},
 	"AutoloadNamespaces": {