From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 31 May 2018 19:01:07 +0000 (+0000)
Subject: Merge "Use PHP 7 '??' operator instead of '?:' with 'isset()' where convenient"
X-Git-Tag: 1.34.0-rc.0~5227
X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=5a6c78c441e9d977bb33a0eb4536d5a3c5067943;p=lhc%2Fweb%2Fwiklou.git

Merge "Use PHP 7 '??' operator instead of '?:' with 'isset()' where convenient"
---

5a6c78c441e9d977bb33a0eb4536d5a3c5067943
diff --cc includes/libs/rdbms/loadbalancer/LoadBalancer.php
index d5195ef3bf,75f8845751..221bca4269
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -1195,16 -1183,8 +1183,16 @@@ class LoadBalancer implements ILoadBala
  		return ( $name != '' ) ? $name : 'localhost';
  	}
  
 +	public function getServerInfo( $i ) {
 +		if ( isset( $this->servers[$i] ) ) {
 +			return $this->servers[$i];
 +		} else {
 +			return false;
 +		}
 +	}
 +
  	public function getServerType( $i ) {
- 		return isset( $this->servers[$i]['type'] ) ? $this->servers[$i]['type'] : 'unknown';
+ 		return $this->servers[$i]['type'] ?? 'unknown';
  	}
  
  	public function getMasterPos() {