X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FConfig.php;h=efb795360cac7c9ba5c882c7ec3480c256b936aa;hb=40a126306621fe9eadb58101bd19a0be32e4c163;hp=d9fab41c147ec7098df7a9c116bd3013964cc122;hpb=2a431b580f2e8f6a596e84175932e793678cde63;p=friendica.git

diff --git a/src/Console/Config.php b/src/Console/Config.php
index d9fab41c14..efb795360c 100644
--- a/src/Console/Config.php
+++ b/src/Console/Config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,7 +23,7 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
 use Friendica\App;
-use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use RuntimeException;
 
 /**
@@ -56,7 +56,7 @@ class Config extends \Asika\SimpleConsole\Console
 	 */
 	private $appMode;
 	/**
-	 * @var IConfig
+	 * @var IManageConfigValues
 	 */
 	private $config;
 
@@ -94,7 +94,7 @@ HELP;
 		return $help;
 	}
 
-	public function __construct(App\Mode $appMode, IConfig $config, array $argv = null)
+	public function __construct(App\Mode $appMode, IManageConfigValues $config, array $argv = null)
 	{
 		parent::__construct($argv);
 
@@ -102,7 +102,7 @@ HELP;
 		$this->config = $config;
 	}
 
-	protected function doExecute()
+	protected function doExecute(): int
 	{
 		if ($this->getOption('v')) {
 			$this->out('Executable: ' . $this->executable);
@@ -115,10 +115,6 @@ HELP;
 			throw new CommandArgsException('Too many arguments');
 		}
 
-		if (!$this->appMode->has(App\Mode::DBCONFIGAVAILABLE)) {
-			$this->out('Database isn\'t ready or populated yet, showing file config only');
-		}
-
 		if (count($this->args) == 3) {
 			$cat = $this->getArgument(0);
 			$key = $this->getArgument(1);
@@ -128,6 +124,10 @@ HELP;
 				throw new RuntimeException("$cat.$key is an array and can't be set using this command.");
 			}
 
+			if ($this->config->get($cat, $key) === $value) {
+				throw new RuntimeException("$cat.$key already set to $value.");
+			}
+
 			$result = $this->config->set($cat, $key, $value);
 			if ($result) {
 				$this->out("{$cat}.{$key} <= " .
@@ -147,13 +147,13 @@ HELP;
 					$this->out("{$cat}.{$key}[{$k}] => " . (is_array($v) ? implode(', ', $v) : $v));
 				}
 			} else {
-				$this->out("{$cat}.{$key} => " . $value);
+				$this->out("{$cat}.{$key} => " . ($value ?? 'NULL'));
 			}
 		}
 
 		if (count($this->args) == 1) {
 			$cat = $this->getArgument(0);
-			$this->config->load($cat);
+			$this->config->reload();
 			$configCache = $this->config->getCache();
 
 			if ($configCache->get($cat) !== null) {
@@ -174,11 +174,7 @@ HELP;
 		}
 
 		if (count($this->args) == 0) {
-			$this->config->load();
-
-			if ($this->config->get('system', 'config_adapter') == 'jit' && $this->appMode->has(App\Mode::DBCONFIGAVAILABLE)) {
-				$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
-			}
+			$this->config->reload();
 
 			$config = $this->config->getCache()->getAll();
 			foreach ($config as $cat => $section) {