From e85c13831241376401419b9f52a2ef6b238d8ef7 Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Tue, 18 Jun 2019 22:18:49 +0200 Subject: [PATCH] rdbms: Fix return type of DatabaseMysqlBase::mysqlFetchArray Change-Id: I7797ae79e8b4c1a88a4f1da342ef4a4f5a78ed74 --- includes/libs/rdbms/database/DatabaseMysqlBase.php | 2 +- includes/libs/rdbms/database/DatabaseMysqli.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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(); -- 2.20.1