From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 14 Nov 2022 19:53:54 +0000 (-0500)
Subject: Ensure Post::toArray returns an array
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=10e48a34f2cd95907eedb253fb32329fe3af6f82;p=friendica.git

Ensure Post::toArray returns an array

- We don't handle query errors anyway
- Remove unused parameter do_close
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1314245581
---

diff --git a/src/Model/Post.php b/src/Model/Post.php
index 635a84efd6..11e5c2c985 100644
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -102,26 +102,25 @@ class Post
 	}
 
 	/**
-	 * Fills an array with data from an post query
+	 * Fills an array with data from a post query
 	 *
-	 * @param object $stmt statement object
-	 * @param bool   $do_close
+	 * @param object|bool $stmt Return value from Database->select
 	 * @return array Data array
-	 * @todo Find proper type-hint for $stmt and maybe avoid boolean
+	 * @throws \Exception
 	 */
-	public static function toArray($stmt, bool $do_close = true)
+	public static function toArray($stmt): array
 	{
 		if (is_bool($stmt)) {
-			return $stmt;
+			return [];
 		}
 
 		$data = [];
 		while ($row = self::fetch($stmt)) {
 			$data[] = $row;
 		}
-		if ($do_close) {
-			DBA::close($stmt);
-		}
+
+		DBA::close($stmt);
+
 		return $data;
 	}