aboutsummaryrefslogtreecommitdiffstats
path: root/maintenance
diff options
context:
space:
mode:
authorAaron Schulz <aschulz@wikimedia.org>2024-10-21 21:22:44 -0700
committerAaron Schulz <aschulz@wikimedia.org>2024-10-24 00:53:37 +0000
commit83adb4549687d83a1f5d4781dbc1cec6440d121c (patch)
tree725a42cf3950bd3572c328cfeb8ac943a3052e55 /maintenance
parentf293d3a5f56c6b8371e87dcdd6685b1740624e17 (diff)
downloadmediawikicore-83adb4549687d83a1f5d4781dbc1cec6440d121c.tar.gz
mediawikicore-83adb4549687d83a1f5d4781dbc1cec6440d121c.zip
maintenance: avoid calling Maintenance::setDBProvider() when not needed
Injecting the connection provider from the service container does not seem to serve much purpose since that is the default anyway. Bug: T377800 Change-Id: Iacd16023be6dba0e4f90b5d720cae190fd9a0c7c
Diffstat (limited to 'maintenance')
-rw-r--r--maintenance/findBadBlobs.php1
-rw-r--r--maintenance/findMissingActors.php1
-rw-r--r--maintenance/includes/Maintenance.php6
3 files changed, 6 insertions, 2 deletions
diff --git a/maintenance/findBadBlobs.php b/maintenance/findBadBlobs.php
index ab2840b584d2..3b0effdb0982 100644
--- a/maintenance/findBadBlobs.php
+++ b/maintenance/findBadBlobs.php
@@ -101,7 +101,6 @@ class FindBadBlobs extends Maintenance {
$services = $this->getServiceContainer();
$this->revisionStore = $services->getRevisionStore();
$this->blobStore = $services->getBlobStore();
- $this->setDBProvider( $services->getConnectionProvider() );
if ( $this->hasOption( 'revisions' ) ) {
if ( $this->hasOption( 'scan-from' ) ) {
diff --git a/maintenance/findMissingActors.php b/maintenance/findMissingActors.php
index 67c767e969bf..1cda5da54a1a 100644
--- a/maintenance/findMissingActors.php
+++ b/maintenance/findMissingActors.php
@@ -136,7 +136,6 @@ class FindMissingActors extends Maintenance {
$this->userFactory = $services->getUserFactory();
$this->userNameUtils = $services->getUserNameUtils();
$this->actorNormalization = $services->getActorNormalization();
- $this->setDBProvider( $services->getConnectionProvider() );
$field = $this->getOption( 'field' );
if ( !$this->getTableInfo( $field ) ) {
diff --git a/maintenance/includes/Maintenance.php b/maintenance/includes/Maintenance.php
index 7d5cb14df4ac..e357236c4932 100644
--- a/maintenance/includes/Maintenance.php
+++ b/maintenance/includes/Maintenance.php
@@ -187,6 +187,12 @@ abstract class Maintenance {
* @var array
*/
public $orderedOptions = [];
+
+ /**
+ * An injected connection provider (e.g. LBFactorySingle during installation); null if none
+ *
+ * @var IConnectionProvider|null
+ */
private ?IConnectionProvider $dbProvider = null;
/**