4 files changed, 36 insertions, 47 deletions

diff --git a/core/Command/Config/App/Base.php b/core/Command/Config/App/Base.php
index 7d3e9a83193..e90a8e78f5b 100644
--- a/core/Command/Config/App/Base.php
+++ b/core/Command/Config/App/Base.php
@@ -1,15 +1,23 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OC\Core\Command\Config\App;
 
-use OCP\IConfig;
+use OC\Config\ConfigManager;
+use OCP\IAppConfig;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 abstract class Base extends \OC\Core\Command\Base {
-	protected IConfig $config;
+	public function __construct(
+		protected IAppConfig $appConfig,
+		protected readonly ConfigManager $configManager,
+	) {
+		parent::__construct();
+	}
 
 	/**
 	 * @param string $argumentName
@@ -18,12 +26,12 @@ abstract class Base extends \OC\Core\Command\Base {
 	 */
 	public function completeArgumentValues($argumentName, CompletionContext $context) {
 		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
+			return $this->appConfig->getApps();
 		}
 
 		if ($argumentName === 'name') {
 			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			return $this->config->getAppKeys($appName);
+			return $this->appConfig->getKeys($appName);
 		}
 		return [];
 	}
diff --git a/core/Command/Config/App/DeleteConfig.php b/core/Command/Config/App/DeleteConfig.php
index 2e34197e541..5a08ecbdc42 100644
--- a/core/Command/Config/App/DeleteConfig.php
+++ b/core/Command/Config/App/DeleteConfig.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -7,19 +8,12 @@
  */
 namespace OC\Core\Command\Config\App;
 
-use OCP\IConfig;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	public function __construct(
-		protected IConfig $config,
-	) {
-		parent::__construct();
-	}
-
 	protected function configure() {
 		parent::configure();
 
@@ -49,12 +43,12 @@ class DeleteConfig extends Base {
 		$appName = $input->getArgument('app');
 		$configName = $input->getArgument('name');
 
-		if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->config->getAppKeys($appName))) {
+		if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->appConfig->getKeys($appName), true)) {
 			$output->writeln('<error>Config ' . $configName . ' of app ' . $appName . ' could not be deleted because it did not exist</error>');
 			return 1;
 		}
 
-		$this->config->deleteAppValue($appName, $configName);
+		$this->appConfig->deleteKey($appName, $configName);
 		$output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
 		return 0;
 	}
diff --git a/core/Command/Config/App/GetConfig.php b/core/Command/Config/App/GetConfig.php
index f64efd3feaa..af0c5648232 100644
--- a/core/Command/Config/App/GetConfig.php
+++ b/core/Command/Config/App/GetConfig.php
@@ -9,19 +9,12 @@ declare(strict_types=1);
 namespace OC\Core\Command\Config\App;
 
 use OCP\Exceptions\AppConfigUnknownKeyException;
-use OCP\IAppConfig;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	public function __construct(
-		protected IAppConfig $appConfig,
-	) {
-		parent::__construct();
-	}
-
 	protected function configure() {
 		parent::configure();
 
@@ -45,6 +38,12 @@ class GetConfig extends Base {
 				'returns complete details about the app config value'
 			)
 			->addOption(
+				'--key-details',
+				null,
+				InputOption::VALUE_NONE,
+				'returns complete details about the app config key'
+			)
+			->addOption(
 				'default-value',
 				null,
 				InputOption::VALUE_OPTIONAL,
@@ -73,6 +72,12 @@ class GetConfig extends Base {
 			return 0;
 		}
 
+		if ($input->getOption('key-details')) {
+			$details = $this->appConfig->getKeyDetails($appName, $configName);
+			$this->writeArrayInOutputFormat($input, $output, $details);
+			return 0;
+		}
+
 		try {
 			$configValue = $this->appConfig->getDetails($appName, $configName)['value'];
 		} catch (AppConfigUnknownKeyException $e) {
diff --git a/core/Command/Config/App/SetConfig.php b/core/Command/Config/App/SetConfig.php
index e983d32d97e..c818404fc0e 100644
--- a/core/Command/Config/App/SetConfig.php
+++ b/core/Command/Config/App/SetConfig.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 namespace OC\Core\Command\Config\App;
 
 use OC\AppConfig;
-use OCP\Exceptions\AppConfigIncorrectTypeException;
 use OCP\Exceptions\AppConfigUnknownKeyException;
 use OCP\IAppConfig;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -20,12 +19,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 
 class SetConfig extends Base {
-	public function __construct(
-		protected IAppConfig $appConfig,
-	) {
-		parent::__construct();
-	}
-
 	protected function configure() {
 		parent::configure();
 
@@ -167,7 +160,6 @@ class SetConfig extends Base {
 			}
 
 			$value = (string)$input->getOption('value');
-
 			switch ($type) {
 				case IAppConfig::VALUE_MIXED:
 					$updated = $this->appConfig->setValueMixed($appName, $configName, $value, $lazy, $sensitive);
@@ -178,34 +170,19 @@ class SetConfig extends Base {
 					break;
 
 				case IAppConfig::VALUE_INT:
-					if ($value !== ((string)((int)$value))) {
-						throw new AppConfigIncorrectTypeException('Value is not an integer');
-					}
-					$updated = $this->appConfig->setValueInt($appName, $configName, (int)$value, $lazy, $sensitive);
+					$updated = $this->appConfig->setValueInt($appName, $configName, $this->configManager->convertToInt($value), $lazy, $sensitive);
 					break;
 
 				case IAppConfig::VALUE_FLOAT:
-					if ($value !== ((string)((float)$value))) {
-						throw new AppConfigIncorrectTypeException('Value is not a float');
-					}
-					$updated = $this->appConfig->setValueFloat($appName, $configName, (float)$value, $lazy, $sensitive);
+					$updated = $this->appConfig->setValueFloat($appName, $configName, $this->configManager->convertToFloat($value), $lazy, $sensitive);
 					break;
 
 				case IAppConfig::VALUE_BOOL:
-					if (in_array(strtolower($value), ['true', '1', 'on', 'yes'])) {
-						$valueBool = true;
-					} elseif (in_array(strtolower($value), ['false', '0', 'off', 'no'])) {
-						$valueBool = false;
-					} else {
-						throw new AppConfigIncorrectTypeException('Value is not a boolean, please use \'true\' or \'false\'');
-					}
-					$updated = $this->appConfig->setValueBool($appName, $configName, $valueBool, $lazy);
+					$updated = $this->appConfig->setValueBool($appName, $configName, $this->configManager->convertToBool($value), $lazy);
 					break;
 
 				case IAppConfig::VALUE_ARRAY:
-					$valueArray = json_decode($value, true, flags: JSON_THROW_ON_ERROR);
-					$valueArray = (is_array($valueArray)) ? $valueArray : throw new AppConfigIncorrectTypeException('Value is not an array');
-					$updated = $this->appConfig->setValueArray($appName, $configName, $valueArray, $lazy, $sensitive);
+					$updated = $this->appConfig->setValueArray($appName, $configName, $this->configManager->convertToArray($value), $lazy, $sensitive);
 					break;
 			}
 		}
@@ -222,6 +199,11 @@ class SetConfig extends Base {
 					$current['lazy'] ? 'lazy cache' : 'fast cache'
 				)
 			);
+			$keyDetails = $this->appConfig->getKeyDetails($appName, $configName);
+			if (($keyDetails['note'] ?? '') !== '') {
+				$output->writeln('<comment>Note:</comment> ' . $keyDetails['note']);
+			}
+
 		} else {
 			$output->writeln('<info>Config value were not updated</info>');
 		}