From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 16 Sep 2016 18:22:10 +0000 (-0700)
Subject: Rename domain => localDomain in LBFactory for consistency
X-Git-Tag: 1.31.0-rc.0~5519
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=0a806b75f1450646bf54c36567e4085968ca0829;p=lhc%2Fweb%2Fwiklou.git

Rename domain => localDomain in LBFactory for consistency

Change-Id: I2fb66f98dddb4acc38958a7b8beec002970d43f7
---

diff --git a/includes/db/loadbalancer/LBFactoryMW.php b/includes/db/loadbalancer/LBFactoryMW.php
index 33c48a5384..2fb48c7f9e 100644
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ b/includes/db/loadbalancer/LBFactoryMW.php
@@ -40,7 +40,7 @@ abstract class LBFactoryMW extends LBFactory implements DestructibleService {
 		global $wgCommandLineMode;
 
 		$defaults = [
-			'domain' => wfWikiID(),
+			'localDomain' => wfWikiID(),
 			'hostname' => wfHostname(),
 			'trxProfiler' => Profiler::instance()->getTransactionProfiler(),
 			'replLogger' => LoggerFactory::getInstance( 'DBReplication' ),
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 107a7e2ddf..b6f331701c 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -50,7 +50,7 @@ abstract class LBFactory {
 	protected $wanCache;
 
 	/** @var string Local domain */
-	protected $domain;
+	protected $localDomain;
 	/** @var string Local hostname of the app server */
 	protected $hostname;
 	/** @var mixed */
@@ -79,7 +79,7 @@ abstract class LBFactory {
 	 * @param array $conf
 	 */
 	public function __construct( array $conf ) {
-		$this->domain = isset( $conf['domain'] ) ? $conf['domain'] : '';
+		$this->localDomain = isset( $conf['localDomain'] ) ? $conf['localDomain'] : '';
 
 		if ( isset( $conf['readOnlyReason'] ) && is_string( $conf['readOnlyReason'] ) ) {
 			$this->readOnlyReason = $conf['readOnlyReason'];
@@ -608,7 +608,7 @@ abstract class LBFactory {
 	 */
 	final protected function baseLoadBalancerParams() {
 		return [
-			'localDomain' => $this->domain,
+			'localDomain' => $this->localDomain,
 			'readOnlyReason' => $this->readOnlyReason,
 			'srvCache' => $this->srvCache,
 			'wanCache' => $this->wanCache,
@@ -641,7 +641,7 @@ abstract class LBFactory {
 	 * @since 1.28
 	 */
 	public function setDomainPrefix( $domain ) {
-		$this->domain = $domain;
+		$this->localDomain = $domain;
 	}
 
 	/**