From 6c00a9cf3b8fddbc48bd1d4e275948d77beec05e Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 21 Feb 2023 10:40:16 +0100
Subject: [PATCH] Save Settings array param to \RainLoop\Settings

---
 .../app/libraries/RainLoop/Providers/Settings.php      |  2 +-
 .../RainLoop/Providers/Settings/DefaultSettings.php    | 10 ++++------
 .../RainLoop/Providers/Settings/ISettings.php          |  2 +-
 snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php |  5 +----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
index 822c689c3..b10a50307 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
@@ -21,7 +21,7 @@ class Settings extends \RainLoop\Providers\AbstractProvider
 
 	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool
 	{
-		return $this->oDriver->Save($oAccount, $oSettings->toArray());
+		return $this->oDriver->Save($oAccount, $oSettings);
 	}
 
 	public function IsActive() : bool
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
index 53e04b73e..1ea00d7a2 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
@@ -26,11 +26,9 @@ class DefaultSettings implements ISettings
 				self::FILE_NAME
 		);
 
-		if (\is_string($sValue))
-		{
+		if (\is_string($sValue)) {
 			$aData = \json_decode($sValue, true);
-			if (\is_array($aData))
-			{
+			if (\is_array($aData)) {
 				return $aData;
 			}
 		}
@@ -38,14 +36,14 @@ class DefaultSettings implements ISettings
 		return array();
 	}
 
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings) : bool
+	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool
 	{
 		return $this->oStorageProvider->Put($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
 			$this->oStorageProvider->IsLocal() ?
 				self::FILE_NAME_LOCAL :
 				self::FILE_NAME,
-			\json_encode($aSettings));
+			\json_encode($oSettings));
 	}
 
 	public function Delete(\RainLoop\Model\Account $oAccount) : bool
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
index b1d1a7f8d..0199d1b5e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
@@ -6,7 +6,7 @@ interface ISettings
 {
 	public function Load(\RainLoop\Model\Account $oAccount) : array;
 
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings) : bool;
+	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool;
 
 	public function Delete(\RainLoop\Model\Account $oAccount) : bool;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
index c4c0d544b..8a2f47ac2 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
@@ -4,10 +4,7 @@ namespace RainLoop;
 
 class Settings implements \JsonSerializable
 {
-	/**
-	 * @var array
-	 */
-	protected $aData = array();
+	protected array $aData = array();
 
 	public function __construct(array $aData)
 	{