Skip to content

refactor: add null guards in db mappers and fix JsonResponse return type for Psalm 6 #12874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ChristophWurst wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: add null guards in db mappers and fix JsonResponse return type for Psalm 6 #12874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions lib/Db/LocalMessageMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,19 @@ public function getAllForUser(string $userId, int $type = LocalMessage::TYPE_OUT

$recipientMap = [];
foreach ($recipients as $r) {
$recipientMap[$r->getLocalMessageId()][] = $r;
$localMessageId = $r->getLocalMessageId();
if ($localMessageId === null) {
continue;
}
$recipientMap[$localMessageId][] = $r;
}
$attachmentMap = [];
foreach ($attachments as $a) {
$attachmentMap[$a->getLocalMessageId()][] = $a;
$localMessageId = $a->getLocalMessageId();
if ($localMessageId === null) {
continue;
}
$attachmentMap[$localMessageId][] = $a;
}

return array_map(static function ($localMessage) use ($attachmentMap, $recipientMap) {
Expand Down Expand Up @@ -134,11 +142,19 @@ public function findDue(int $time, int $type = LocalMessage::TYPE_OUTGOING): arr

$recipientMap = [];
foreach ($recipients as $r) {
$recipientMap[$r->getLocalMessageId()][] = $r;
$localMessageId = $r->getLocalMessageId();
if ($localMessageId === null) {
continue;
}
$recipientMap[$localMessageId][] = $r;
}
$attachmentMap = [];
foreach ($attachments as $a) {
$attachmentMap[$a->getLocalMessageId()][] = $a;
$localMessageId = $a->getLocalMessageId();
if ($localMessageId === null) {
continue;
}
$attachmentMap[$localMessageId][] = $a;
}

return array_map(static function ($localMessage) use ($attachmentMap, $recipientMap) {
Expand Down Expand Up @@ -183,11 +199,19 @@ public function findDueDrafts(int $time): array {

$recipientMap = [];
foreach ($recipients as $r) {
$recipientMap[$r->getLocalMessageId()][] = $r;
$localMessageId = $r->getLocalMessageId();
if ($localMessageId === null) {
continue;
}
$recipientMap[$localMessageId][] = $r;
}
$attachmentMap = [];
foreach ($attachments as $a) {
$attachmentMap[$a->getLocalMessageId()][] = $a;
$localMessageId = $a->getLocalMessageId();
if ($localMessageId === null) {
continue;
}
$attachmentMap[$localMessageId][] = $a;
}

return array_map(static function ($localMessage) use ($attachmentMap, $recipientMap) {
Expand Down Expand Up @@ -232,7 +256,7 @@ public function updateWithRecipients(LocalMessage $message, array $to, array $cc
try {
$message = $this->update($message);

$this->recipientMapper->updateRecipients($message->getId(), $message->getRecipients(), $to, $cc, $bcc);
$this->recipientMapper->updateRecipients($message->getId(), $message->getRecipients() ?? [], $to, $cc, $bcc);
$recipients = $this->recipientMapper->findByLocalMessageId($message->getId());
$message->setRecipients($recipients);
$this->db->commit();
Expand Down
6 changes: 4 additions & 2 deletions lib/Db/MessageMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,8 @@ public function updateBulk(Account $account, bool $permflagsEnabled, Message ...
*/
private function updateTags(Account $account, Message $message, array $tags, PerformanceLoggerTask $perf): void {
$imapTags = $message->getTags();
$dbTags = $tags[$message->getMessageId()] ?? [];
$messageId = $message->getMessageId();
$dbTags = $messageId !== null ? ($tags[$messageId] ?? []) : [];

if ($imapTags === [] && $dbTags === []) {
// neither old nor new tags
Expand Down Expand Up @@ -1340,7 +1341,8 @@ public function findRelatedData(array $messages, string $userId): array {
$tags = $this->tagMapper->getAllTagsForMessages($messages, $userId);
/** @var Message $message */
$messages = array_map(static function ($message) use ($tags) {
$message->setTags($tags[$message->getMessageId()] ?? []);
$messageId = $message->getMessageId();
$message->setTags($messageId !== null ? ($tags[$messageId] ?? []) : []);
return $message;
}, $messages);
return $messages;
Expand Down
2 changes: 1 addition & 1 deletion lib/Http/JsonResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static function error(string $message,
* @param Http::STATUS_* $status
* @param array|JsonSerializable|bool|string $data
*
* @return static
* @return self
*/
public static function errorFromThrowable(Throwable $error,
int $status = Http::STATUS_INTERNAL_SERVER_ERROR,
Expand Down
Loading