From ef850e37f72520a82a824ce6a86c3290a4a7dd28 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 26 Dec 2023 16:26:12 +0100 Subject: [PATCH] Cleanup SequenceSet --- .../v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php | 2 +- snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php | 3 +++ snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php index 9a9498511..0f54b8f7d 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php @@ -289,7 +289,7 @@ trait Messages $this->FolderSelect($sFolderName); $iNewUid = $this->MessageAppendStream($sFolderName, $rMessageStream, $iStreamSize, $aFlagsList, $iDateTime); if ($iUid) { - $oRange = new SequenceSet([$iUid]); + $oRange = new SequenceSet($iUid); $this->MessageStoreFlag($oRange, array(MessageFlag::DELETED), StoreAction::ADD_FLAGS_SILENT diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php index d5ac526ac..e8f742980 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php @@ -28,6 +28,9 @@ class SequenceSet /*extends \SplFixedArray*/ implements \Countable private array $data = []; + /** + * @param mixed $mItems Can be array, string or int + */ public function __construct($mItems, bool $uid = true) { if (\is_array($mItems)) { diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php b/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php index d4d0043ba..38d5e8172 100644 --- a/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php +++ b/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php @@ -198,7 +198,7 @@ class Sync ); if ($iAppendUid && $aFlags) { $this->MessageStoreFlag( - new SequenceSet([$iAppendUid]), + new SequenceSet($iAppendUid), $aFlags, \MailSo\Imap\Enumerations\StoreAction::ADD_FLAGS_SILENT );