Skip to content

Commit cba1ffa

Browse files
committed
Add more precise PHPDoc to EventCommentMapper
1 parent 4f9816e commit cba1ffa

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/Model/EventCommentMapper.php

+13-8
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,11 @@ public function getCommentInfo($comment_id): false|array
246246
$stmt->execute(["event_comment_id" => $comment_id]);
247247

248248
/**
249-
* @var array<string,mixed>|false $row
249+
* @var array{event_id: int}|false $row
250250
*/
251-
if ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
252-
return $row;
253-
}
251+
$row = $stmt->fetch(PDO::FETCH_ASSOC);
254252

255-
return false;
253+
return $row ?: false;
256254
}
257255

258256
/**
@@ -320,13 +318,20 @@ public function getReportedCommentsByEventId($event_id, $moderated = false)
320318
$comment_stmt = $this->_db->prepare($comment_sql);
321319

322320
/**
323-
* @var array<string,mixed>|false $row
321+
* @var array{
322+
* reporting_user_id: int,
323+
* deciding_user_id: int,
324+
* decision: string,
325+
* event_comment_id: int,
326+
* event_id: string
327+
* }|false $row
324328
*/
325-
while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
329+
$row = $stmt->fetch(PDO::FETCH_ASSOC);
330+
while ($row) {
326331
$total++;
327332
$comment_result = $comment_stmt->execute(['comment_id' => $row['event_comment_id']]);
328333

329-
if ($comment_result && $comment = $comment_stmt->fetch(PDO::FETCH_ASSOC)) {
334+
if ($comment_result && /** @var array|false $comment */ $comment = $comment_stmt->fetch(PDO::FETCH_ASSOC)) {
330335
// work around the existing transform logic
331336
$comment_array = [$comment];
332337
$comment_array = parent::transformResults($comment_array, true);

0 commit comments

Comments
 (0)