From 237dd3f142853f0f239b848f3fdf5ec50d161a90 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 3 Jul 2019 23:29:06 -0700
Subject: [PATCH] rdbms: fix typo and clean up some cruft in MWLBFactory

Change-Id: Ib51dfee9ed06326a8b3acfed136e75b13fc4e234
---
 includes/db/MWLBFactory.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index 27695cc984..3d404d3c8e 100644
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -70,6 +70,7 @@ abstract class MWLBFactory {
 	 * @param BagOStuff $mainStash
 	 * @param WANObjectCache $wanCache
 	 * @return array
+	 * @internal For use with service wiring
 	 */
 	public static function applyDefaultConfig(
 		array $lbConf,
@@ -152,8 +153,11 @@ abstract class MWLBFactory {
 			$serversCheck = [ $lbConf['serverTemplate'] ] ?? [];
 		}
 
-		self::assertValidServerConfigs( $serversCheck, $options->get( 'DBname' ),
-			$options->get( 'DBprefix' ) );
+		self::assertValidServerConfigs(
+			$serversCheck,
+			$options->get( 'DBname' ),
+			$options->get( 'DBprefix' )
+		);
 
 		$lbConf = self::injectObjectCaches( $lbConf, $srvCace, $mainStash, $wanCache );
 
@@ -164,7 +168,7 @@ abstract class MWLBFactory {
 	 * @return array
 	 */
 	private static function getDbTypesWithSchemas() {
-		return [ 'postgres', 'msssql' ];
+		return [ 'postgres', 'mssql' ];
 	}
 
 	/**
@@ -328,6 +332,7 @@ abstract class MWLBFactory {
 	 *
 	 * @param array $config (e.g. $wgLBFactoryConf)
 	 * @return string Class name
+	 * @internal For use with service wiring
 	 */
 	public static function getLBFactoryClass( array $config ) {
 		// For configuration backward compatibility after removing
@@ -365,13 +370,9 @@ abstract class MWLBFactory {
 	/**
 	 * @param LBFactory $lbFactory
 	 * @param string $dbType 'mysql', 'sqlite', etc.
+	 * @internal For use with service wiring
 	 */
 	public static function setSchemaAliases( LBFactory $lbFactory, $dbType ) {
-		if ( $dbType instanceof Config ) {
-			// Before 1.34 this took a whole Config just to get $dbType
-			wfDeprecated( __METHOD__ . ' with Config argument', '1.34' );
-			$dbType = $dbType->get( 'DBtype' );
-		}
 		if ( $dbType === 'mysql' ) {
 			/**
 			 * When SQLite indexes were introduced in r45764, it was noted that
@@ -398,6 +399,7 @@ abstract class MWLBFactory {
 	/**
 	 * Log a database deprecation warning
 	 * @param string $msg Deprecation message
+	 * @internal For use with service wiring
 	 */
 	public static function logDeprecation( $msg ) {
 		global $wgDevelopmentWarnings;
-- 
2.20.1