From: Umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 18 Jun 2019 20:18:49 +0000 (+0200)
Subject: rdbms: Fix return type of DatabaseMysqlBase::mysqlFetchArray
X-Git-Tag: 1.34.0-rc.0~1357^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=e85c13831241376401419b9f52a2ef6b238d8ef7;p=lhc%2Fweb%2Fwiklou.git

rdbms: Fix return type of DatabaseMysqlBase::mysqlFetchArray

Change-Id: I7797ae79e8b4c1a88a4f1da342ef4a4f5a78ed74
---

diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index e871ab99d5..b5f83dae0d 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -369,7 +369,7 @@ abstract class DatabaseMysqlBase extends Database {
 	 * Fetch a result row as an associative and numeric array
 	 *
 	 * @param resource $res Raw result
-	 * @return array
+	 * @return array|false
 	 */
 	abstract protected function mysqlFetchArray( $res );
 
diff --git a/includes/libs/rdbms/database/DatabaseMysqli.php b/includes/libs/rdbms/database/DatabaseMysqli.php
index 937f381ac1..703c64d7c0 100644
--- a/includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/includes/libs/rdbms/database/DatabaseMysqli.php
@@ -203,7 +203,7 @@ class DatabaseMysqli extends DatabaseMysqlBase {
 
 	/**
 	 * @param mysqli_result $res
-	 * @return bool
+	 * @return array|false
 	 */
 	protected function mysqlFetchArray( $res ) {
 		$array = $res->fetch_array();