From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 26 May 2018 00:29:17 +0000 (-0700)
Subject: Avoid PHP 7.2 warnings in DBConRefTest about count() on non-Countable
X-Git-Tag: 1.31.2~85
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/User:Test/%27http:/jquery.khurshid.com/ifixpng.php/%40%20%27info_etape_suivante_2%27%20=%3E%20%27You%20can%20move%20on%20to%20the%20next%20step.%27%2C%20%27info_exceptions_proxy%27%20=%3E%20%27Exceptions%20for%20the%20proxy%27%2C%20%27info_exportation_base%27%20=%3E%20%27export%20database%20to%20%40archive%40%27%2C-%27info_facilite_suivi_activite%27%20=%3E%20%27To%20simplify%20monitoring%20of%20the%20site/%27s%20editorial;-%20%20activities%2C%20SPIP%20can%20send%20rmail%20notifications%2C%20e.g.%20to%20an%20editors/%27%20mailing%20list%2C%20%27info_facilite_suivi_activite%27%20=%3E%20%27To%20simplify%20monitoring%20of%20the%20site%C3%A2%C2%80%C2%99s%20editorial;%20%20%20activities%2C%20SPIP%20can%20send%20rmail%20notifications%2C%20e.g.%20to%20an%20editors%C3%A2%C2%80%C2%99%20mailing%20list%2C%20%20%20of%20publication%20requests%20and%20article%20validations.%27%2C%20%27info_fichiers_authent%27%20=%3E%20%27Authentication%20file?a=commitdiff_plain;h=14d08d1df93a9e2d98d505769be94c96b348f8c5;p=lhc%2Fweb%2Fwiklou.git

Avoid PHP 7.2 warnings in DBConRefTest about count() on non-Countable

Change-Id: Ida81bf998b462f2f6bb2b708df1f15bbc1933db1
(cherry picked from commit b172aff090b7c59c2f602931d469cf3ac5e9e74a)
---

diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index c94f62fb5b..decd9bfa4b 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -33,7 +33,7 @@ class DBConnRef implements IDatabase {
 		$this->lb = $lb;
 		if ( $conn instanceof Database ) {
 			$this->conn = $conn; // live handle
-		} elseif ( count( $conn ) >= 4 && $conn[self::FLD_DOMAIN] !== false ) {
+		} elseif ( is_array( $conn ) && count( $conn ) >= 4 && $conn[self::FLD_DOMAIN] !== false ) {
 			$this->params = $conn;
 		} else {
 			throw new InvalidArgumentException( "Missing lazy connection arguments." );