Update

miraheze · Nov 20, 2024 · b5dbd21 · b5dbd21
1 parent e6224e8
commit b5dbd21
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 40 deletions.
diff --git a/includes/FormFactory/ManageWikiFormFactory.php b/includes/FormFactory/ManageWikiFormFactory.php
@@ -12,7 +12,7 @@
 use Miraheze\ManageWiki\Helpers\ManageWikiOOUIForm;
 use Miraheze\ManageWiki\ManageWiki;
 use UnexpectedValueException;
-use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\IDatabase;
 
 class ManageWikiFormFactory {
 
@@ -44,9 +44,8 @@ public function getForm(
 		string $filtered = '',
 		string $formClass = ManageWikiOOUIForm::class
 	) {
-		$dbw = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()
-			->getMainLB( $config->get( 'CreateWikiDatabase' ) )
-			->getMaintenanceConnectionRef( DB_PRIMARY, [], $config->get( 'CreateWikiDatabase' ) );
+		$dbw = MediaWikiServices::getInstance()->getConnectionProvider()
+			->getPrimaryDatabase( 'virtual-createwiki' );
 
 		$ceMW = ManageWiki::checkPermission( $remoteWiki, $context->getUser(), $module );
 
@@ -79,7 +78,7 @@ protected function submitForm(
 		bool $ceMW,
 		string $dbName,
 		RemoteWikiFactory $remoteWiki,
-		DBConnRef $dbw,
+		IDatabase $dbw,
 		Config $config,
 		string $special = '',
 		string $filtered = ''

diff --git a/includes/FormFactory/ManageWikiFormFactoryBuilder.php b/includes/FormFactory/ManageWikiFormFactoryBuilder.php
@@ -22,7 +22,7 @@
 use Miraheze\ManageWiki\Helpers\ManageWikiSettings;
 use Miraheze\ManageWiki\Helpers\ManageWikiTypes;
 use Miraheze\ManageWiki\ManageWiki;
-use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\IDatabase;
 
 class ManageWikiFormFactoryBuilder {
 
@@ -816,7 +816,7 @@ public static function submissionHandler(
 		string $dbName,
 		IContextSource $context,
 		RemoteWikiFactory $remoteWiki,
-		DBConnRef $dbw,
+		IDatabase $dbw,
 		Config $config,
 		string $special = '',
 		string $filtered = ''
@@ -872,7 +872,7 @@ private static function submissionCore(
 		string $dbName,
 		IContextSource $context,
 		RemoteWikiFactory $remoteWiki,
-		DBConnRef $dbw,
+		IDatabase $dbw,
 		Config $config
 	) {
 		$mwActions = [

diff --git a/includes/Helpers/ManageWikiDeletedWikiPager.php b/includes/Helpers/ManageWikiDeletedWikiPager.php
@@ -11,9 +11,8 @@ class ManageWikiDeletedWikiPager extends TablePager {
 
 	public function __construct( $page ) {
 		$config = MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'managewiki' );
-		$this->mDb = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()
-			->getMainLB( $config->get( 'CreateWikiDatabase' ) )
-			->getMaintenanceConnectionRef( DB_REPLICA, [], $config->get( 'CreateWikiDatabase' ) );
+		$this->mDb = MediaWikiServices::getInstance()->getConnectionProvider()
+			->getReplicaDatabase( 'virtual-createwiki' );
 
 		parent::__construct( $page->getContext(), $page->getLinkRenderer() );
 	}

diff --git a/includes/Helpers/ManageWikiExtensions.php b/includes/Helpers/ManageWikiExtensions.php
@@ -5,7 +5,7 @@
 use MediaWiki\Config\Config;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Handler for all interactions with Extension changes within ManageWiki
@@ -16,7 +16,7 @@ class ManageWikiExtensions {
 	private $committed = false;
 	/** @var Config Configuration Object */
 	private $config;
-	/** @var DBConnRef Database Connection */
+	/** @var IDatabase Database Connection */
 	private $dbw;
 	/** @var array Extension configuration ($wgManageWikiExtensions) */
 	private $extConfig;
@@ -44,9 +44,8 @@ public function __construct( string $wiki ) {
 		$this->config = MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'managewiki' );
 		$this->extConfig = $this->config->get( 'ManageWikiExtensions' );
 
-		$this->dbw = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()
-			->getMainLB( $this->config->get( 'CreateWikiDatabase' ) )
-			->getMaintenanceConnectionRef( DB_PRIMARY, [], $this->config->get( 'CreateWikiDatabase' ) );
+		$this->dbw = MediaWikiServices::getInstance()->getConnectionProvider()
+			->getPrimaryDatabase( 'virtual-createwiki' );
 
 		$exts = $this->dbw->selectRow(
 			'mw_settings',

diff --git a/includes/Helpers/ManageWikiNamespaces.php b/includes/Helpers/ManageWikiNamespaces.php
@@ -6,7 +6,7 @@
 use MediaWiki\MediaWikiServices;
 use MediaWiki\SpecialPage\SpecialPage;
 use Miraheze\ManageWiki\Jobs\NamespaceMigrationJob;
-use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Handler for interacting with Namespace configuration
@@ -17,7 +17,7 @@ class ManageWikiNamespaces {
 	private $committed = false;
 	/** @var Config Configuration object */
 	private $config;
-	/** @var DBConnRef Database connection */
+	/** @var IDatabase Database connection */
 	private $dbw;
 	/** @var array Namespace IDs to be deleted */
 	private $deleteNamespaces = [];
@@ -44,9 +44,8 @@ public function __construct( string $wiki ) {
 		$this->wiki = $wiki;
 		$this->config = MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'managewiki' );
 
-		$this->dbw = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()
-			->getMainLB( $this->config->get( 'CreateWikiDatabase' ) )
-			->getMaintenanceConnectionRef( DB_PRIMARY, [], $this->config->get( 'CreateWikiDatabase' ) );
+		$this->dbw = MediaWikiServices::getInstance()->getConnectionProvider()
+			->getPrimaryDatabase( 'virtual-createwiki' );
 
 		$namespaces = $this->dbw->select(
 			'mw_namespaces',

diff --git a/includes/Helpers/ManageWikiPermissions.php b/includes/Helpers/ManageWikiPermissions.php
@@ -5,7 +5,7 @@
 use MediaWiki\Config\Config;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\User\User;
-use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Handler for interacting with Permissions
@@ -16,7 +16,7 @@ class ManageWikiPermissions {
 	private $committed = false;
 	/** @var Config Configuration object */
 	private $config;
-	/** @var DBConnRef Database connection */
+	/** @var IDatabase Database connection */
 	private $dbw;
 	/** @var array Deletion queue */
 	private $deleteGroups = [];
@@ -41,9 +41,8 @@ class ManageWikiPermissions {
 	public function __construct( string $wiki ) {
 		$this->wiki = $wiki;
 		$this->config = MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'managewiki' );
-		$this->dbw = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()
-			->getMainLB( $this->config->get( 'CreateWikiDatabase' ) )
-			->getMaintenanceConnectionRef( DB_PRIMARY, [], $this->config->get( 'CreateWikiDatabase' ) );
+		$this->dbw = MediaWikiServices::getInstance()->getConnectionProvider()
+			->getPrimaryDatabase( 'virtual-createwiki' );
 
 		$perms = $this->dbw->select(
 			'mw_permissions',

diff --git a/includes/Helpers/ManageWikiSettings.php b/includes/Helpers/ManageWikiSettings.php
@@ -4,7 +4,7 @@
 
 use MediaWiki\Config\Config;
 use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Handler class for managing settings
@@ -15,7 +15,7 @@ class ManageWikiSettings {
 	private $committed = false;
 	/** @var Config Configuration object */
 	private $config;
-	/** @var DBConnRef Database object */
+	/** @var IDatabase Database object */
 	private $dbw;
 	/** @var array Current settings with their respective values */
 	private $liveSettings;
@@ -44,9 +44,8 @@ public function __construct( string $wiki ) {
 		$this->config = MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'managewiki' );
 		$this->settingsConfig = $this->config->get( 'ManageWikiSettings' );
 
-		$this->dbw = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()
-			->getMainLB( $this->config->get( 'CreateWikiDatabase' ) )
-			->getMaintenanceConnectionRef( DB_PRIMARY, [], $this->config->get( 'CreateWikiDatabase' ) );
+		$this->dbw = MediaWikiServices::getInstance()->getConnectionProvider()
+			->getPrimaryDatabase( 'virtual-createwiki' );
 
 		$settings = $this->dbw->selectRow(
 			'mw_settings',

diff --git a/includes/Hooks/ManageWikiCoreFormSubmissionHook.php b/includes/Hooks/ManageWikiCoreFormSubmissionHook.php
@@ -4,14 +4,14 @@
 
 use MediaWiki\Context\IContextSource;
 use Miraheze\CreateWiki\Services\RemoteWikiFactory;
-use Wikimedia\Rdbms\DBConnRef;
+use Wikimedia\Rdbms\IDatabase;
 
 interface ManageWikiCoreFormSubmissionHook {
 
 	/**
 	 * @param IContextSource $context
 	 * @param string $dbName
-	 * @param DBConnRef $dbw
+	 * @param IDatabase $dbw
 	 * @param array $formData
 	 * @param RemoteWikiFactory &$remoteWiki
 	 * @return void

diff --git a/includes/ManageWiki.php b/includes/ManageWiki.php
@@ -95,9 +95,8 @@ public static function handleMatrix( $conversion, $to ) {
 	public static function namespaceID( string $namespace ) {
 		$config = MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 'managewiki' );
 
-		$dbr = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()
-			->getMainLB( $config->get( 'CreateWikiDatabase' ) )
-			->getMaintenanceConnectionRef( DB_REPLICA, [], $config->get( 'CreateWikiDatabase' ) );
+		$dbr = MediaWikiServices::getInstance()->getConnectionProvider()
+			->getReplicaDatabase( 'virtual-createwiki' );
 
 		$nsID = ( $namespace == '' ) ? false : $dbr->selectRow(
 			'mw_namespaces',

diff --git a/maintenance/populateGroupPermissions.php b/maintenance/populateGroupPermissions.php
@@ -73,7 +73,8 @@ public function execute() {
 			}
 		}
 
-		$dbw = $this->getDB( DB_PRIMARY, [], $this->getConfig()->get( 'CreateWikiDatabase' ) );
+		$connectionProvider = $this->getServiceContainer()->getConnectionProvider();
+		$dbw = $connectionProvider->getPrimaryDatabase( 'virtual-createwiki' );
 
 		foreach ( $grouparray as $groupname => $groupatr ) {
 			$check = $dbw->selectRow(

diff --git a/maintenance/populateGroupPermissionsWithDefaults.php b/maintenance/populateGroupPermissionsWithDefaults.php
@@ -23,7 +23,8 @@ public function __construct() {
 	}
 
 	public function execute() {
-		$dbw = $this->getDB( DB_PRIMARY, [], $this->getConfig()->get( 'CreateWikiDatabase' ) );
+		$connectionProvider = $this->getServiceContainer()->getConnectionProvider();
+		$dbw = $connectionProvider->getPrimaryDatabase( 'virtual-createwiki' );
 
 		if ( $this->getOption( 'overwrite' ) ) {
 			$dbw->delete(

diff --git a/maintenance/populateNamespaces.php b/maintenance/populateNamespaces.php
@@ -26,7 +26,8 @@ public function execute() {
 			$this->fatalError( 'Disable ManageWiki Namespaces on this wiki.' );
 		}
 
-		$dbw = $this->getDB( DB_PRIMARY, [], $this->getConfig()->get( 'CreateWikiDatabase' ) );
+		$connectionProvider = $this->getServiceContainer()->getConnectionProvider();
+		$dbw = $connectionProvider->getPrimaryDatabase( 'virtual-createwiki' );
 
 		$namespaces = $this->getConfig()->get( MainConfigNames::CanonicalNamespaceNames ) + [ 0 => '<Main>' ];
 

diff --git a/maintenance/populateNamespacesWithDefaults.php b/maintenance/populateNamespacesWithDefaults.php
@@ -23,7 +23,8 @@ public function __construct() {
 	}
 
 	public function execute() {
-		$dbw = $this->getDB( DB_PRIMARY, [], $this->getConfig()->get( 'CreateWikiDatabase' ) );
+		$connectionProvider = $this->getServiceContainer()->getConnectionProvider();
+		$dbw = $connectionProvider->getPrimaryDatabase( 'virtual-createwiki' );
 
 		if ( $this->getOption( 'overwrite' ) ) {
 			$dbw->delete(