Add a CreateWikiConfig service (#669)

miraheze · Feb 22, 2025 · b4524a5 · b4524a5
1 parent 98ac88b
commit b4524a5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git a/extension.json b/extension.json
@@ -49,7 +49,7 @@
 		"RequestWikiAIJob": {
 			"class": "Miraheze\\CreateWiki\\Jobs\\RequestWikiAIJob",
 			"services": [
-				"ConfigFactory",
+				"CreateWikiConfig",
 				"CreateWikiHookRunner",
 				"WikiRequestManager"
 			],
@@ -58,7 +58,7 @@
 		"RequestWikiRemoteAIJob": {
 			"class": "Miraheze\\CreateWiki\\Jobs\\RequestWikiRemoteAIJob",
 			"services": [
-				"ConfigFactory",
+				"CreateWikiConfig",
 				"WikiRequestManager",
 				"HttpRequestFactory"
 			],
@@ -67,7 +67,7 @@
 		"SetContainersAccessJob": {
 			"class": "Miraheze\\CreateWiki\\Jobs\\SetContainersAccessJob",
 			"services": [
-				"ConfigFactory",
+				"CreateWikiConfig",
 				"RepoGroup"
 			],
 			"needsPage": false
@@ -225,8 +225,8 @@
 		"Main": {
 			"class": "Miraheze\\CreateWiki\\Hooks\\Handlers\\Main",
 			"services": [
-				"ConfigFactory",
 				"ConnectionProvider",
+				"CreateWikiConfig",
 				"CreateWikiDatabaseUtils",
 				"CreateWikiDataFactory",
 				"RemoteWikiFactory"

diff --git a/includes/Hooks/Handlers/Main.php b/includes/Hooks/Handlers/Main.php
@@ -4,7 +4,6 @@
 
 use MediaWiki\Block\Hook\GetAllBlockActionsHook;
 use MediaWiki\Config\Config;
-use MediaWiki\Config\ConfigFactory;
 use MediaWiki\Hook\GetMagicVariableIDsHook;
 use MediaWiki\Hook\LoginFormValidErrorMessagesHook;
 use MediaWiki\Hook\ParserGetVariableValueSwitchHook;
@@ -31,16 +30,13 @@ class Main implements
 	UserGetReservedNamesHook
 {
 
-	private readonly Config $config;
-
 	public function __construct(
-		ConfigFactory $configFactory,
 		private readonly IConnectionProvider $connectionProvider,
+		private readonly Config $config,
 		private readonly CreateWikiDatabaseUtils $databaseUtils,
 		private readonly CreateWikiDataFactory $dataFactory,
 		private readonly RemoteWikiFactory $remoteWikiFactory
 	) {
-		$this->config = $configFactory->makeConfig( 'CreateWiki' );
 	}
 
 	/** @inheritDoc */

diff --git a/includes/Jobs/RequestWikiAIJob.php b/includes/Jobs/RequestWikiAIJob.php
@@ -4,7 +4,6 @@
 
 use Job;
 use MediaWiki\Config\Config;
-use MediaWiki\Config\ConfigFactory;
 use MediaWiki\User\User;
 use Miraheze\CreateWiki\ConfigNames;
 use Miraheze\CreateWiki\CreateWikiRegexConstraint;
@@ -16,23 +15,19 @@ class RequestWikiAIJob extends Job {
 
 	public const JOB_NAME = 'RequestWikiAIJob';
 
-	private readonly Config $config;
-
 	private readonly int $id;
 	private readonly string $reason;
 
 	public function __construct(
 		array $params,
-		ConfigFactory $configFactory,
+		private readonly Config $config,
 		private readonly CreateWikiHookRunner $hookRunner,
 		private readonly WikiRequestManager $wikiRequestManager
 	) {
 		parent::__construct( self::JOB_NAME, $params );
 
 		$this->id = $params['id'];
 		$this->reason = $params['reason'];
-
-		$this->config = $configFactory->makeConfig( 'CreateWiki' );
 	}
 
 	public function run(): bool {

diff --git a/includes/Jobs/RequestWikiRemoteAIJob.php b/includes/Jobs/RequestWikiRemoteAIJob.php
@@ -5,7 +5,6 @@
 use Exception;
 use Job;
 use MediaWiki\Config\Config;
-use MediaWiki\Config\ConfigFactory;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Logger\LoggerFactory;
@@ -22,7 +21,6 @@ class RequestWikiRemoteAIJob extends Job {
 
 	public const JOB_NAME = 'RequestWikiRemoteAIJob';
 
-	private readonly Config $config;
 	private readonly LoggerInterface $logger;
 	private readonly MessageLocalizer $messageLocalizer;
 
@@ -32,13 +30,12 @@ class RequestWikiRemoteAIJob extends Job {
 
 	public function __construct(
 		array $params,
-		ConfigFactory $configFactory,
+		private readonly Config $config,
 		private readonly WikiRequestManager $wikiRequestManager,
 		private readonly HttpRequestFactory $httpRequestFactory
 	) {
 		parent::__construct( self::JOB_NAME, $params );
 
-		$this->config = $configFactory->makeConfig( 'CreateWiki' );
 		$this->logger = LoggerFactory::getInstance( 'CreateWiki' );
 		$this->messageLocalizer = RequestContext::getMain();
 

diff --git a/includes/Jobs/SetContainersAccessJob.php b/includes/Jobs/SetContainersAccessJob.php
@@ -4,26 +4,22 @@
 
 use Job;
 use MediaWiki\Config\Config;
-use MediaWiki\Config\ConfigFactory;
 use Miraheze\CreateWiki\ConfigNames;
 use RepoGroup;
 
 class SetContainersAccessJob extends Job {
 
 	public const JOB_NAME = 'SetContainersAccessJob';
 
-	private readonly Config $config;
 	private readonly bool $isPrivate;
 
 	public function __construct(
 		array $params,
-		ConfigFactory $configFactory,
+		private readonly Config $config,
 		private readonly RepoGroup $repoGroup
 	) {
 		parent::__construct( self::JOB_NAME, $params );
-
 		$this->isPrivate = $params['private'];
-		$this->config = $configFactory->makeConfig( 'CreateWiki' );
 	}
 
 	public function run(): bool {

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Config\Config;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MediaWikiServices;
@@ -13,6 +14,9 @@
 use Miraheze\CreateWiki\Services\WikiRequestManager;
 
 return [
+	'CreateWikiConfig' => static function ( MediaWikiServices $services ): Config {
+		return $services->getConfigFactory()->makeConfig( 'CreateWiki' );
+	},
 	'CreateWikiDatabaseUtils' => static function ( MediaWikiServices $services ): CreateWikiDatabaseUtils {
 		return new CreateWikiDatabaseUtils(
 			$services->getConnectionProvider()
@@ -25,7 +29,7 @@
 			$services->get( 'CreateWikiHookRunner' ),
 			new ServiceOptions(
 				CreateWikiDataFactory::CONSTRUCTOR_OPTIONS,
-				$services->getConfigFactory()->makeConfig( 'CreateWiki' )
+				$services->get( 'CreateWikiConfig' )
 			)
 		);
 	},
@@ -40,7 +44,7 @@
 			RequestContext::getMain(),
 			new ServiceOptions(
 				CreateWikiNotificationsManager::CONSTRUCTOR_OPTIONS,
-				$services->getConfigFactory()->makeConfig( 'CreateWiki' )
+				$services->get( 'CreateWikiConfig' )
 			),
 			$services->getUserFactory()
 		);
@@ -50,7 +54,7 @@
 			$services->get( 'CreateWikiDatabaseUtils' ),
 			new ServiceOptions(
 				CreateWikiRestUtils::CONSTRUCTOR_OPTIONS,
-				$services->getConfigFactory()->makeConfig( 'CreateWiki' )
+				$services->get( 'CreateWikiConfig' )
 			)
 		);
 	},
@@ -62,7 +66,7 @@
 			$services->getJobQueueGroupFactory(),
 			new ServiceOptions(
 				RemoteWikiFactory::CONSTRUCTOR_OPTIONS,
-				$services->getConfigFactory()->makeConfig( 'CreateWiki' )
+				$services->get( 'CreateWikiConfig' )
 			)
 		);
 	},
@@ -76,7 +80,7 @@
 			RequestContext::getMain(),
 			new ServiceOptions(
 				WikiManagerFactory::CONSTRUCTOR_OPTIONS,
-				$services->getConfigFactory()->makeConfig( 'CreateWiki' )
+				$services->get( 'CreateWikiConfig' )
 			)
 		);
 	},
@@ -91,7 +95,7 @@
 			$services->get( 'WikiManagerFactory' ),
 			new ServiceOptions(
 				WikiRequestManager::CONSTRUCTOR_OPTIONS,
-				$services->getConfigFactory()->makeConfig( 'CreateWiki' )
+				$services->get( 'CreateWikiConfig' )
 			)
 		);
 	},