Use typed version of IConfig::getSystemValue as much as possible

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php
index b6376dc0146..e88c305eeec 100644
--- a/lib/private/Encryption/Keys/Storage.php
+++ b/lib/private/Encryption/Keys/Storage.php
@@ -237,7 +237,7 @@ class Storage implements IStorage {
 
 		if (!array_key_exists('uid', $data) || $data['uid'] !== $uid) {
 			// If the migration is done we error out
-			$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+			$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
 			if (version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=')) {
 				return $data['key'];
 			}
@@ -272,7 +272,7 @@ class Storage implements IStorage {
 				$data = $this->view->file_get_contents($path);
 
 				// Version <20.0.0.1 doesn't have this
-				$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+				$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
 				if (version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=')) {
 					$key = [
 						'key' => base64_encode($data),
@@ -335,7 +335,7 @@ class Storage implements IStorage {
 	private function setKey($path, $key) {
 		$this->keySetPreparation(dirname($path));
 
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
 		if (version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=')) {
 			// Only store old format if this happens during the migration.
 			// TODO: Remove for 21
diff --git a/lib/private/Encryption/Manager.php b/lib/private/Encryption/Manager.php
index a553d6a55d1..f751bd94b28 100644
--- a/lib/private/Encryption/Manager.php
+++ b/lib/private/Encryption/Manager.php
@@ -73,7 +73,7 @@ class Manager implements IManager {
 	 * @return bool true if enabled, false if not
 	 */
 	public function isEnabled() {
-		$installed = $this->config->getSystemValue('installed', false);
+		$installed = $this->config->getSystemValueBool('installed', false);
 		if (!$installed) {
 			return false;
 		}
diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index 371f2588289..6ae0006e955 100644
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -70,7 +70,7 @@ class Util {
 	protected $config;
 
 	/** @var array paths excluded from encryption */
-	protected $excludedPaths;
+	protected array $excludedPaths = [];
 	protected IGroupManager $groupManager;
 	protected IUserManager $userManager;
 
@@ -94,7 +94,7 @@ class Util {
 		$this->config = $config;
 
 		$this->excludedPaths[] = 'files_encryption';
-		$this->excludedPaths[] = 'appdata_' . $config->getSystemValue('instanceid', null);
+		$this->excludedPaths[] = 'appdata_' . $config->getSystemValueString('instanceid');
 		$this->excludedPaths[] = 'files_external';
 	}