Skip to content

[stable5.7] fix(imap): avoid expanding UID ranges #12719

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

Merged
ChristophWurst merged 1 commit into from
Apr 14, 2026
+20 −22
Merged

[stable5.7] fix(imap): avoid expanding UID ranges #12719

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
42 changes: 20 additions & 22 deletions lib/IMAP/Sync/Synchronizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function sync(Horde_Imap_Client_Base $imapClient,
}

/**
* @psalm-return list{int[], int[], int[]} [$newUids, $changedUids, $vanishedUids]
* @psalm-return list{Horde_Imap_Client_Ids, Horde_Imap_Client_Ids, int[]} [$newUids, $changedUids, $vanishedUids]
* @throws Horde_Imap_Client_Exception
* @throws Horde_Imap_Client_Exception_Sync
*/
Expand All @@ -110,14 +110,14 @@ private function doCombinedSync(Horde_Imap_Client_Base $imapClient,
]);

return [
$syncData->newmsgsuids->ids,
$syncData->flagsuids->ids,
$syncData->newmsgsuids,
$syncData->flagsuids,
$syncData->vanisheduids->ids,
];
}

/**
* @psalm-return list{int[], int[], int[]} [$newUids, $changedUids, $vanishedUids]
* @psalm-return list{Horde_Imap_Client_Ids|array, Horde_Imap_Client_Ids|array, int[]} [$newUids, $changedUids, $vanishedUids]
* @throws Horde_Imap_Client_Exception
* @throws Horde_Imap_Client_Exception_Sync
*/
Expand Down Expand Up @@ -152,37 +152,35 @@ private function doSplitSync(Horde_Imap_Client_Base $imapClient,
* @param Horde_Imap_Client_Mailbox $mailbox
* @param Request $request
*
* @return array
* @return Horde_Imap_Client_Ids
* @throws Horde_Imap_Client_Exception
* @throws Horde_Imap_Client_Exception_Sync
*/
private function getNewMessageUids(Horde_Imap_Client_Base $imapClient, Horde_Imap_Client_Mailbox $mailbox, Request $request): array {
$newUids = $imapClient->sync($mailbox, $request->getToken(), [
private function getNewMessageUids(Horde_Imap_Client_Base $imapClient, Horde_Imap_Client_Mailbox $mailbox, Request $request): Horde_Imap_Client_Ids {
return $imapClient->sync($mailbox, $request->getToken(), [
'criteria' => Horde_Imap_Client::SYNC_NEWMSGSUIDS,
])->newmsgsuids->ids;
return $newUids;
])->newmsgsuids;
}

/**
* @param Horde_Imap_Client_Base $imapClient
* @param Horde_Imap_Client_Mailbox $mailbox
* @param Request $request
*
* @return array
* @return Horde_Imap_Client_Ids
*/
private function getChangedMessageUids(Horde_Imap_Client_Base $imapClient, Horde_Imap_Client_Mailbox $mailbox, Request $request): array {
// Without QRESYNC we need to specify the known ids and in oder to avoid
private function getChangedMessageUids(Horde_Imap_Client_Base $imapClient, Horde_Imap_Client_Mailbox $mailbox, Request $request): Horde_Imap_Client_Ids {
// Without QRESYNC we need to specify the known ids and in order to avoid
// overly long IMAP commands they have to be chunked.
return array_merge(
[], // for php<7.4 https://www.php.net/manual/en/function.array-merge.php
...array_map(
static fn (Horde_Imap_Client_Ids $uids) => $imapClient->sync($mailbox, $request->getToken(), [
'criteria' => Horde_Imap_Client::SYNC_FLAGSUIDS,
'ids' => $uids,
])->flagsuids->ids,
chunk_uid_sequence($request->getUids(), self::UID_CHUNK_MAX_BYTES)
)
);
$combined = new Horde_Imap_Client_Ids();
foreach (chunk_uid_sequence($request->getUids(), self::UID_CHUNK_MAX_BYTES) as $chunk) {
$syncResult = $imapClient->sync($mailbox, $request->getToken(), [
'criteria' => Horde_Imap_Client::SYNC_FLAGSUIDS,
'ids' => $chunk,
]);
$combined->add($syncResult->flagsuids);
}
return $combined;
}

/**
Expand Down
Loading