From 734e2af35c09d3c906a7e11bb965b19c99f2a644 Mon Sep 17 00:00:00 2001
From: daniel <dkinzler@wikimedia.org>
Date: Tue, 22 Jun 2021 17:18:17 +0200
Subject: [PATCH] Put onMediaWikiServices into a separate handler class.

The MediaWikiServices hook runs before the service container is fully initialized, so it cannot have services injected. For this reason, it needs to be separate from the handlers for other hooks.

Change-Id: I1519aea8bca2f3977fcf15ee8776a1b3319687b5
---
 extension.json                 |  5 ++-
 includes/ConfigHookHandler.php | 62 ++++++++++++++++++++++++++++++++++
 includes/Hooks.php             | 26 --------------
 3 files changed, 66 insertions(+), 27 deletions(-)
 create mode 100644 includes/ConfigHookHandler.php

diff --git a/extension.json b/extension.json
index ceba5438..87ba8d37 100644
--- a/extension.json
+++ b/extension.json
@@ -85,10 +85,13 @@
 		"default": {
 			"class": "MediaWiki\\Extension\\CategoryTree\\Hooks",
 			"services": [ "DBLoadBalancer", "MainConfig" ]
+		},
+		"config": {
+			"class": "MediaWiki\\Extension\\CategoryTree\\ConfigHookHandler"
 		}
 	},
 	"Hooks": {
-		"MediaWikiServices": "default",
+		"MediaWikiServices": "config",
 		"ArticleFromTitle": "default",
 		"SpecialTrackingCategories::preprocess": "default",
 		"SpecialTrackingCategories::generateCatLink": "default",
diff --git a/includes/ConfigHookHandler.php b/includes/ConfigHookHandler.php
new file mode 100644
index 00000000..0c3c98a5
--- /dev/null
+++ b/includes/ConfigHookHandler.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * © 2006-2008 Daniel Kinzler and others
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Extensions
+ * @author Daniel Kinzler, brightbyte.de
+ */
+
+namespace MediaWiki\Extension\CategoryTree;
+
+use MediaWiki\Hook\MediaWikiServicesHook;
+use MediaWiki\MediaWikiServices;
+
+/**
+ * Hook handler for manipulating configuration.
+ *
+ * @note This hook runs before the service container is fully initialized, so it cannot have
+ * services injected. For this reason, it needs to be separate from the handlers for other
+ * hooks.
+ */
+class ConfigHookHandler implements MediaWikiServicesHook {
+
+	/**
+	 * Adjusts config once MediaWiki is fully initialised
+	 * TODO: Don't do this, lazy initialize the config
+	 * @param MediaWikiServices $services
+	 */
+	public function onMediaWikiServices( $services ) {
+		global $wgCategoryTreeDefaultOptions, $wgCategoryTreeDefaultMode;
+		global $wgCategoryTreeCategoryPageOptions, $wgCategoryTreeCategoryPageMode;
+		global $wgCategoryTreeOmitNamespace;
+
+		if ( !isset( $wgCategoryTreeDefaultOptions['mode'] ) ) {
+			$wgCategoryTreeDefaultOptions['mode'] = $wgCategoryTreeDefaultMode;
+		}
+
+		if ( !isset( $wgCategoryTreeDefaultOptions['hideprefix'] ) ) {
+			$wgCategoryTreeDefaultOptions['hideprefix'] = $wgCategoryTreeOmitNamespace;
+		}
+
+		if ( !isset( $wgCategoryTreeCategoryPageOptions['mode'] ) ) {
+			$wgCategoryTreeCategoryPageOptions['mode'] = $wgCategoryTreeCategoryPageMode;
+		}
+	}
+
+}
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 7193bbf1..871d4580 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -30,14 +30,12 @@ use Config;
 use Html;
 use IContextSource;
 use MediaWiki\Hook\BeforePageDisplayHook;
-use MediaWiki\Hook\MediaWikiServicesHook;
 use MediaWiki\Hook\OutputPageMakeCategoryLinksHook;
 use MediaWiki\Hook\OutputPageParserOutputHook;
 use MediaWiki\Hook\ParserFirstCallInitHook;
 use MediaWiki\Hook\SkinBuildSidebarHook;
 use MediaWiki\Hook\SpecialTrackingCategories__generateCatLinkHook;
 use MediaWiki\Hook\SpecialTrackingCategories__preprocessHook;
-use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\Hook\ArticleFromTitleHook;
 use OutputPage;
 use Parser;
@@ -61,7 +59,6 @@ class Hooks implements
 	SpecialTrackingCategories__generateCatLinkHook,
 	BeforePageDisplayHook,
 	OutputPageParserOutputHook,
-	MediaWikiServicesHook,
 	SkinBuildSidebarHook,
 	ParserFirstCallInitHook,
 	OutputPageMakeCategoryLinksHook
@@ -95,29 +92,6 @@ class Hooks implements
 		return $wgCategoryTreeForceHeaders;
 	}
 
-	/**
-	 * Adjusts config once MediaWiki is fully initialised
-	 * TODO: Don't do this, lazy initialize the config
-	 * @param MediaWikiServices $services
-	 */
-	public function onMediaWikiServices( $services ) {
-		global $wgCategoryTreeDefaultOptions, $wgCategoryTreeDefaultMode;
-		global $wgCategoryTreeCategoryPageOptions, $wgCategoryTreeCategoryPageMode;
-		global $wgCategoryTreeOmitNamespace;
-
-		if ( !isset( $wgCategoryTreeDefaultOptions['mode'] ) ) {
-			$wgCategoryTreeDefaultOptions['mode'] = $wgCategoryTreeDefaultMode;
-		}
-
-		if ( !isset( $wgCategoryTreeDefaultOptions['hideprefix'] ) ) {
-			$wgCategoryTreeDefaultOptions['hideprefix'] = $wgCategoryTreeOmitNamespace;
-		}
-
-		if ( !isset( $wgCategoryTreeCategoryPageOptions['mode'] ) ) {
-			$wgCategoryTreeCategoryPageOptions['mode'] = $wgCategoryTreeCategoryPageMode;
-		}
-	}
-
 	/**
 	 * @param Parser $parser
 	 */