From 851c1b647282b70c976e098ebd03f3fda9ebcc15 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 26 Feb 2024 20:33:19 +0100
Subject: [PATCH] abstract class StoreAction to enum

---
 .../libraries/MailSo/Imap/Commands/Messages.php    |  7 +++----
 .../MailSo/Imap/Enumerations/StoreAction.php       | 14 +++++++-------
 .../0.0.0/app/libraries/MailSo/Mail/MailClient.php |  5 +++--
 3 files changed, 13 insertions(+), 13 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 69293d6bc..de781d786 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
@@ -354,11 +354,10 @@ trait Messages
 	 * @throws \MailSo\RuntimeException
 	 * @throws \MailSo\Net\Exceptions\*
 	 * @throws \MailSo\Imap\Exceptions\*
-	 * $sStoreAction = \MailSo\Imap\Enumerations\StoreAction::ADD_FLAGS_SILENT
 	 */
-	public function MessageStoreFlag(SequenceSet $oRange, array $aInputStoreItems, string $sStoreAction) : ?ResponseCollection
+	public function MessageStoreFlag(SequenceSet $oRange, array $aInputStoreItems, StoreAction $eStoreAction) : ?ResponseCollection
 	{
-		if (!\count($oRange) || !\strlen(\trim($sStoreAction)) || !\count($aInputStoreItems)) {
+		if (!\count($oRange) || !\count($aInputStoreItems)) {
 			return null;
 		}
 
@@ -372,7 +371,7 @@ trait Messages
 
 		return $this->SendRequestGetResponse(
 			$oRange->UID ? 'UID STORE' : 'STORE',
-			array((string) $oRange, $sStoreAction, $aInputStoreItems)
+			array((string) $oRange, $eStoreAction->value, $aInputStoreItems)
 		);
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
index 172e0e89b..f7cb02570 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
@@ -16,12 +16,12 @@ namespace MailSo\Imap\Enumerations;
  * @package Imap
  * @subpackage Enumerations
  */
-abstract class StoreAction
+enum StoreAction: string
 {
-//	const SET_FLAGS = 'FLAGS';
-//	const SET_FLAGS_SILENT = 'FLAGS.SILENT';
-	const ADD_FLAGS = '+FLAGS';
-	const ADD_FLAGS_SILENT = '+FLAGS.SILENT';
-	const REMOVE_FLAGS = '-FLAGS';
-	const REMOVE_FLAGS_SILENT = '-FLAGS.SILENT';
+//	case SET_FLAGS = 'FLAGS';
+//	case SET_FLAGS_SILENT = 'FLAGS.SILENT';
+	case ADD_FLAGS = '+FLAGS';
+	case ADD_FLAGS_SILENT = '+FLAGS.SILENT';
+	case REMOVE_FLAGS = '-FLAGS';
+	case REMOVE_FLAGS_SILENT = '-FLAGS.SILENT';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index 1ac9cc2ed..1f2c4aa07 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -103,8 +103,9 @@ class MailClient
 	{
 		if (\count($oRange)) {
 			if ($this->oImapClient->FolderSelect($sFolderName)->IsFlagSupported($sMessageFlag)) {
-				$sStoreAction = $bSetAction ? StoreAction::ADD_FLAGS_SILENT : StoreAction::REMOVE_FLAGS_SILENT;
-				$this->oImapClient->MessageStoreFlag($oRange, array($sMessageFlag), $sStoreAction);
+				$this->oImapClient->MessageStoreFlag($oRange, array($sMessageFlag),
+					$bSetAction ? StoreAction::ADD_FLAGS_SILENT : StoreAction::REMOVE_FLAGS_SILENT
+				);
 			} else if (!$bSkipUnsupportedFlag) {
 				throw new \MailSo\RuntimeException('Message flag "'.$sMessageFlag.'" is not supported.');
 			}