From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 16 Dec 2016 03:32:26 +0000 (-0800)
Subject: Fix various minor IDEA warnings in LoadBalancer
X-Git-Tag: 1.31.0-rc.0~4534^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=614028768bbeb6143808544a68c9e72af648e031;p=lhc%2Fweb%2Fwiklou.git

Fix various minor IDEA warnings in LoadBalancer

Change-Id: Ic65a04ca1b988fe36e088709d7dc4e981670cb62
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 8601785b19..baab031566 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -441,12 +441,15 @@ class LoadBalancer implements ILoadBalancer {
 
 	/**
 	 * @param int $i
-	 * @return IDatabase
+	 * @return IDatabase|bool
 	 */
 	public function getAnyOpenConnection( $i ) {
 		foreach ( $this->mConns as $connsByServer ) {
 			if ( !empty( $connsByServer[$i] ) ) {
-				return reset( $connsByServer[$i] );
+				/** @var $serverConns IDatabase[] */
+				$serverConns = $connsByServer[$i];
+
+				return reset( $serverConns );
 			}
 		}