From: addshore <addshorewiki@gmail.com>
Date: Tue, 4 Jul 2017 18:39:42 +0000 (+0100)
Subject: Allow install.php to run env-checks with no db
X-Git-Tag: 1.31.0-rc.0~2800^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=ba87c9a6c65aa149eca48d86cf4fdf91ae4cd9d0;p=lhc%2Fweb%2Fwiklou.git

Allow install.php to run env-checks with no db

Bug: T169668
Change-Id: Ibb05b26cbf2d26c02ee7f26497e16d2c98e97de2
---

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index e649c9d171..53a317a7c2 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -113,14 +113,18 @@ $maintenance->execute();
 // Potentially debug globals
 $maintenance->globals();
 
-// Perform deferred updates.
-$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-$lbFactory->commitMasterChanges( $maintClass );
-DeferredUpdates::doUpdates();
+if ( $maintenance->getDbType() !== Maintenance::DB_NONE ) {
+	// Perform deferred updates.
+	$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+	$lbFactory->commitMasterChanges( $maintClass );
+	DeferredUpdates::doUpdates();
+}
 
 // log profiling info
 wfLogProfilingData();
 
-// Commit and close up!
-$lbFactory->commitMasterChanges( 'doMaintenance' );
-$lbFactory->shutdown( $lbFactory::SHUTDOWN_NO_CHRONPROT );
+if ( isset( $lbFactory ) ) {
+	// Commit and close up!
+	$lbFactory->commitMasterChanges( 'doMaintenance' );
+	$lbFactory->shutdown( $lbFactory::SHUTDOWN_NO_CHRONPROT );
+}
diff --git a/maintenance/install.php b/maintenance/install.php
index 81b6d9c8be..cac3009a8f 100644
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -90,6 +90,13 @@ class CommandLineInstaller extends Maintenance {
 		$this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
 	}
 
+	public function getDbType() {
+		if ( $this->hasOption( 'env-checks' ) ) {
+			return Maintenance::DB_NONE;
+		}
+		return parent::getDbType();
+	}
+
 	function execute() {
 		global $IP;