fix(encryption): Use typed IAppConfig methods to prevent type conflicts

Fixes AppConfigTypeConflictException when setting encryption configuration
values. The deprecated setAppValue()/getAppValue() methods default to MIXED
type, which conflicts with existing STRING type values in the database.

Changes:
- core/Command/Encryption/Enable: Use setValueString/getValueString
- core/Command/Encryption/Disable: Use setValueString/getValueString
- tests/lib/Traits/EncryptionTrait: Use typed IAppConfig methods

This resolves all 29 test failures in the PRIMARY-s3 PHPUnit test group
where encryption setup was throwing type conflict exceptions.

Signed-off-by: Stephen Cuppett <steve@cuppett.com>

Author: cuppett

core/Command/Encryption/Disable.php

@@ -7,6 +7,7 @@
  */
 namespace OC\Core\Command\Encryption;
 
+use OCP\IAppConfig;
 use OCP\IConfig;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -15,6 +16,7 @@
 class Disable extends Command {
 	public function __construct(
 		protected IConfig $config,
+		protected IAppConfig $appConfig,
 	) {
 		parent::__construct();
 	}
@@ -27,10 +29,10 @@ protected function configure() {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
+		if ($this->appConfig->getValueString('core', 'encryption_enabled', 'no') !== 'yes') {
 			$output->writeln('Encryption is already disabled');
 		} else {
-			$this->config->setAppValue('core', 'encryption_enabled', 'no');
+			$this->appConfig->setValueString('core', 'encryption_enabled', 'no');
 			$output->writeln('<info>Encryption disabled</info>');
 		}
 		return 0;

core/Command/Encryption/Enable.php

@@ -8,6 +8,7 @@
 namespace OC\Core\Command\Encryption;
 
 use OCP\Encryption\IManager;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -16,6 +17,7 @@
 class Enable extends Command {
 	public function __construct(
 		protected IConfig $config,
+		protected IAppConfig $appConfig,
 		protected IManager $encryptionManager,
 	) {
 		parent::__construct();
@@ -29,10 +31,10 @@ protected function configure() {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($this->config->getAppValue('core', 'encryption_enabled', 'no') === 'yes') {
+		if ($this->appConfig->getValueString('core', 'encryption_enabled', 'no') === 'yes') {
 			$output->writeln('Encryption is already enabled');
 		} else {
-			$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+			$this->appConfig->setValueString('core', 'encryption_enabled', 'yes');
 			$output->writeln('<info>Encryption enabled</info>');
 		}
 		$output->writeln('');
@@ -42,7 +44,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$output->writeln('<error>No encryption module is loaded</error>');
 			return 1;
 		}
-		$defaultModule = $this->config->getAppValue('core', 'default_encryption_module');
+		$defaultModule = $this->appConfig->getValueString('core', 'default_encryption_module', '');
 		if ($defaultModule === '') {
 			$output->writeln('<error>No default module is set</error>');
 			return 1;

tests/lib/Traits/EncryptionTrait.php

@@ -109,18 +109,20 @@ protected function setUpEncryptionTrait() {
 		$this->encryptionApp = new Application([], $isReady);
 
 		$this->config = Server::get(IConfig::class);
-		$this->encryptionWasEnabled = $this->config->getAppValue('core', 'encryption_enabled', 'no');
-		$this->originalEncryptionModule = $this->config->getAppValue('core', 'default_encryption_module');
-		$this->config->setAppValue('core', 'default_encryption_module', Encryption::ID);
-		$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+		$appConfig = Server::get(\OCP\IAppConfig::class);
+		$this->encryptionWasEnabled = $appConfig->getValueString('core', 'encryption_enabled', 'no');
+		$this->originalEncryptionModule = $appConfig->getValueString('core', 'default_encryption_module', '');
+		$appConfig->setValueString('core', 'default_encryption_module', Encryption::ID);
+		$appConfig->setValueString('core', 'encryption_enabled', 'yes');
 		$this->assertTrue(Server::get(\OCP\Encryption\IManager::class)->isEnabled());
 	}
 
 	protected function tearDownEncryptionTrait() {
 		if ($this->config) {
-			$this->config->setAppValue('core', 'encryption_enabled', $this->encryptionWasEnabled);
-			$this->config->setAppValue('core', 'default_encryption_module', $this->originalEncryptionModule);
-			$this->config->deleteAppValue('encryption', 'useMasterKey');
+			$appConfig = Server::get(\OCP\IAppConfig::class);
+			$appConfig->setValueString('core', 'encryption_enabled', $this->encryptionWasEnabled);
+			$appConfig->setValueString('core', 'default_encryption_module', $this->originalEncryptionModule);
+			$appConfig->deleteKey('encryption', 'useMasterKey');
 		}
 	}
 }