From: Paladox <thomasmulhall410@yahoo.com>
Date: Sat, 15 Oct 2016 17:01:34 +0000 (+0000)
Subject: Fix LoadBalancerSingle::reallyOpenConnection() signature
X-Git-Tag: 1.31.0-rc.0~5103
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/wiki/supprimer.php?a=commitdiff_plain;h=34de93fa70e04efb690a8d49e19ba58d75d9f9e5;p=lhc%2Fweb%2Fwiklou.git

Fix LoadBalancerSingle::reallyOpenConnection() signature

Declaration of LoadBalancerSingle::reallyOpenConnection() should be
compatible with
LoadBalancer::reallyOpenConnection(array $server, $dbNameOverride = false)

Caught in https://travis-ci.org/paladox/mediawiki/jobs/167910508

Change-Id: I9bc30249c3b43c3dd3b4eb6f3a70765ef428fd2c
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
index 9de4850fc1..0dec95f888 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php
@@ -75,7 +75,7 @@ class LoadBalancerSingle extends LoadBalancer {
 	 *
 	 * @return IDatabase
 	 */
-	protected function reallyOpenConnection( $server, $dbNameOverride = false ) {
+	protected function reallyOpenConnection( array $server, $dbNameOverride = false ) {
 		return $this->db;
 	}
 }