From ce1773b70d714a1d390eee75dfd5b0faaa8c822b Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 21 Jun 2018 01:27:49 +0100
Subject: [PATCH] rdbms: make some LBFactory fields private

Change-Id: I3fbd35048556593e298731cb497cc83335c5ad8e
---
 includes/libs/rdbms/lbfactory/LBFactory.php | 55 +++++++++++----------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 9a30383b3f..856bd32623 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -38,23 +38,24 @@ use LogicException;
  */
 abstract class LBFactory implements ILBFactory {
 	/** @var ChronologyProtector */
-	protected $chronProt;
+	private $chronProt;
 	/** @var object|string Class name or object With profileIn/profileOut methods */
-	protected $profiler;
+	private $profiler;
 	/** @var TransactionProfiler */
-	protected $trxProfiler;
+	private $trxProfiler;
 	/** @var LoggerInterface */
-	protected $replLogger;
+	private $replLogger;
 	/** @var LoggerInterface */
-	protected $connLogger;
+	private $connLogger;
 	/** @var LoggerInterface */
-	protected $queryLogger;
+	private $queryLogger;
 	/** @var LoggerInterface */
-	protected $perfLogger;
+	private $perfLogger;
 	/** @var callable Error logger */
-	protected $errorLogger;
+	private $errorLogger;
 	/** @var callable Deprecation logger */
-	protected $deprecationLogger;
+	private $deprecationLogger;
+
 	/** @var BagOStuff */
 	protected $srvCache;
 	/** @var BagOStuff */
@@ -64,33 +65,33 @@ abstract class LBFactory implements ILBFactory {
 
 	/** @var DatabaseDomain Local domain */
 	protected $localDomain;
+
 	/** @var string Local hostname of the app server */
-	protected $hostname;
+	private $hostname;
 	/** @var array Web request information about the client */
-	protected $requestInfo;
-
-	/** @var mixed */
-	protected $ticket;
-	/** @var string|bool String if a requested DBO_TRX transaction round is active */
-	protected $trxRoundId = false;
-	/** @var string|bool Reason all LBs are read-only or false if not */
-	protected $readOnlyReason = false;
-	/** @var callable[] */
-	protected $replicationWaitCallbacks = [];
+	private $requestInfo;
+	/** @var bool Whether this PHP instance is for a CLI script */
+	private $cliMode;
+	/** @var string Agent name for query profiling */
+	private $agent;
 
 	/** @var array[] $aliases Map of (table => (dbname, schema, prefix) map) */
-	protected $tableAliases = [];
+	private $tableAliases = [];
 	/** @var string[] Map of (index alias => index) */
-	protected $indexAliases = [];
-
-	/** @var bool Whether this PHP instance is for a CLI script */
-	protected $cliMode;
-	/** @var string Agent name for query profiling */
-	protected $agent;
+	private $indexAliases = [];
+	/** @var callable[] */
+	private $replicationWaitCallbacks = [];
 
+	/** @var mixed */
+	private $ticket;
+	/** @var string|bool String if a requested DBO_TRX transaction round is active */
+	private $trxRoundId = false;
 	/** @var string One of the ROUND_* class constants */
 	private $trxRoundStage = self::ROUND_CURSORY;
 
+	/** @var string|bool Reason all LBs are read-only or false if not */
+	protected $readOnlyReason = false;
+
 	/** @var string|null */
 	private $defaultGroup = null;
 
-- 
2.20.1