mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10191 from mexon/mat/user-config-console-command

Browse source 
Add error message when setting config to existing value
This commit is contained in:
Hypolite Petovan 2021-05-01 16:39:30 -04:00 committed by GitHub
parent 0649d2c393 18762c8e6e
commit cd97f6f25f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Console/Config.php
View file

@ -128,6 +128,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} <= " .

26
tests/src/Console/ConfigConsoleTest.php
View file

@ -65,8 +65,13 @@ class ConfigConsoleTest extends ConsoleTest
$this->configMock
->shouldReceive('get')
->with('config', 'test')
->andReturn('now')
->andReturn('old')
->twice();
$this->configMock
->shouldReceive('get')
->with('config', 'test')
->andReturn('now')
->once();
$console = new Config($this->appMode, $this->configMock, $this->consoleArgv);
$console->setArgument(0, 'config');
@ -118,6 +123,23 @@ class ConfigConsoleTest extends ConsoleTest
self::assertEquals("[Error] config.test is an array and can't be set using this command.\n", $txt);
}
public function testSetExistingValue()
{
$this->configMock
->shouldReceive('get')
->with('config', 'test')
->andReturn('now')
->twice();
$console = new Config($this->appMode, $this->configMock, $this->consoleArgv);
$console->setArgument(0, 'config');
$console->setArgument(1, 'test');
$console->setArgument(2, 'now');
$txt = $this->dumpExecute($console);
self::assertEquals("[Error] config.test already set to now.\n", $txt);
}
public function testTooManyArguments()
{
$console = new Config($this->appMode, $this->configMock, $this->consoleArgv);
@ -171,7 +193,7 @@ CONF;
->shouldReceive('get')
->with('test', 'it')
->andReturn(null)
->once();
->twice();
$console = new Config($this->appMode, $this->configMock, [$this->consoleArgv]);
$console->setArgument(0, 'test');
$console->setArgument(1, 'it');