nextcloud / server

tests/Core/Command/Config/App/DeleteConfigTest.php

Indentation +67 added lines, -67 removed lines

@@ -18,81 +18,81 @@
 use Test\TestCase;
 
 class DeleteConfigTest extends TestCase {
-	protected IAppConfig&MockObject $appConfig;
-	protected InputInterface&MockObject $consoleInput;
-	protected OutputInterface&MockObject $consoleOutput;
-	protected Command $command;
+    protected IAppConfig&MockObject $appConfig;
+    protected InputInterface&MockObject $consoleInput;
+    protected OutputInterface&MockObject $consoleOutput;
+    protected Command $command;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->consoleInput = $this->createMock(InputInterface::class);
-		$this->consoleOutput = $this->createMock(OutputInterface::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->consoleInput = $this->createMock(InputInterface::class);
+        $this->consoleOutput = $this->createMock(OutputInterface::class);
 
-		$this->command = new DeleteConfig($this->appConfig);
-	}
+        $this->command = new DeleteConfig($this->appConfig);
+    }
 
 
-	public static function dataDelete(): array {
-		return [
-			[
-				'name',
-				true,
-				true,
-				0,
-				'info',
-			],
-			[
-				'name',
-				true,
-				false,
-				0,
-				'info',
-			],
-			[
-				'name',
-				false,
-				false,
-				0,
-				'info',
-			],
-			[
-				'name',
-				false,
-				true,
-				1,
-				'error',
-			],
-		];
-	}
+    public static function dataDelete(): array {
+        return [
+            [
+                'name',
+                true,
+                true,
+                0,
+                'info',
+            ],
+            [
+                'name',
+                true,
+                false,
+                0,
+                'info',
+            ],
+            [
+                'name',
+                false,
+                false,
+                0,
+                'info',
+            ],
+            [
+                'name',
+                false,
+                true,
+                1,
+                'error',
+            ],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataDelete
-	 */
-	public function testDelete(string $configName, bool $configExists, bool $checkIfExists, int $expectedReturn, string $expectedMessage): void {
-		$this->appConfig->expects(($checkIfExists) ? $this->once() : $this->never())
-			->method('getKeys')
-			->with('app-name')
-			->willReturn($configExists ? [$configName] : []);
+    /**
+     * @dataProvider dataDelete
+     */
+    public function testDelete(string $configName, bool $configExists, bool $checkIfExists, int $expectedReturn, string $expectedMessage): void {
+        $this->appConfig->expects(($checkIfExists) ? $this->once() : $this->never())
+            ->method('getKeys')
+            ->with('app-name')
+            ->willReturn($configExists ? [$configName] : []);
 
-		$this->appConfig->expects(($expectedReturn === 0) ? $this->once() : $this->never())
-			->method('deleteKey')
-			->with('app-name', $configName);
+        $this->appConfig->expects(($expectedReturn === 0) ? $this->once() : $this->never())
+            ->method('deleteKey')
+            ->with('app-name', $configName);
 
-		$this->consoleInput->expects($this->exactly(2))
-			->method('getArgument')
-			->willReturnMap([
-				['app', 'app-name'],
-				['name', $configName],
-			]);
-		$this->consoleInput->method('hasParameterOption')
-			->with('--error-if-not-exists')
-			->willReturn($checkIfExists);
+        $this->consoleInput->expects($this->exactly(2))
+            ->method('getArgument')
+            ->willReturnMap([
+                ['app', 'app-name'],
+                ['name', $configName],
+            ]);
+        $this->consoleInput->method('hasParameterOption')
+            ->with('--error-if-not-exists')
+            ->willReturn($checkIfExists);
 
-		$this->consoleOutput->method('writeln')
-			->with($this->stringContains($expectedMessage));
+        $this->consoleOutput->method('writeln')
+            ->with($this->stringContains($expectedMessage));
 
-		$this->assertSame($expectedReturn, self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-	}
+        $this->assertSame($expectedReturn, self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+    }
 }

tests/Core/Command/Config/App/SetConfigTest.php

Indentation +73 added lines, -73 removed lines

@@ -20,87 +20,87 @@
 use Test\TestCase;
 
 class SetConfigTest extends TestCase {
-	protected IAppConfig&MockObject $appConfig;
-	protected InputInterface&MockObject $consoleInput;
-	protected OutputInterface&MockObject $consoleOutput;
-	protected Command $command;
+    protected IAppConfig&MockObject $appConfig;
+    protected InputInterface&MockObject $consoleInput;
+    protected OutputInterface&MockObject $consoleOutput;
+    protected Command $command;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->appConfig = $this->createMock(AppConfig::class);
-		$this->consoleInput = $this->createMock(InputInterface::class);
-		$this->consoleOutput = $this->createMock(OutputInterface::class);
+        $this->appConfig = $this->createMock(AppConfig::class);
+        $this->consoleInput = $this->createMock(InputInterface::class);
+        $this->consoleOutput = $this->createMock(OutputInterface::class);
 
-		$this->command = new SetConfig($this->appConfig);
-	}
+        $this->command = new SetConfig($this->appConfig);
+    }
 
 
-	public static function dataSet(): array {
-		return [
-			[
-				'name',
-				'newvalue',
-				true,
-				true,
-				true,
-				'info',
-			],
-			[
-				'name',
-				'newvalue',
-				false,
-				true,
-				false,
-				'comment',
-			],
-		];
-	}
+    public static function dataSet(): array {
+        return [
+            [
+                'name',
+                'newvalue',
+                true,
+                true,
+                true,
+                'info',
+            ],
+            [
+                'name',
+                'newvalue',
+                false,
+                true,
+                false,
+                'comment',
+            ],
+        ];
+    }
 
-	/**
-	 * @dataProvider dataSet
-	 */
-	public function testSet(string $configName, mixed $newValue, bool $configExists, bool $updateOnly, bool $updated, string $expectedMessage): void {
-		$this->appConfig->method('hasKey')
-			->with('app-name', $configName)
-			->willReturn($configExists);
+    /**
+     * @dataProvider dataSet
+     */
+    public function testSet(string $configName, mixed $newValue, bool $configExists, bool $updateOnly, bool $updated, string $expectedMessage): void {
+        $this->appConfig->method('hasKey')
+            ->with('app-name', $configName)
+            ->willReturn($configExists);
 
-		if (!$configExists) {
-			$this->appConfig->method('getValueType')
-				->willThrowException(new AppConfigUnknownKeyException());
-		} else {
-			$this->appConfig->method('getValueType')
-				->willReturn(IAppConfig::VALUE_MIXED);
-		}
+        if (!$configExists) {
+            $this->appConfig->method('getValueType')
+                ->willThrowException(new AppConfigUnknownKeyException());
+        } else {
+            $this->appConfig->method('getValueType')
+                ->willReturn(IAppConfig::VALUE_MIXED);
+        }
 
-		if ($updated) {
-			$this->appConfig->expects($this->once())
-				->method('setValueMixed')
-				->with('app-name', $configName, $newValue);
-		}
+        if ($updated) {
+            $this->appConfig->expects($this->once())
+                ->method('setValueMixed')
+                ->with('app-name', $configName, $newValue);
+        }
 
-		$this->consoleInput->expects($this->exactly(2))
-			->method('getArgument')
-			->willReturnMap([
-				['app', 'app-name'],
-				['name', $configName],
-			]);
-		$this->consoleInput->method('getOption')
-			->willReturnMap([
-				['value', $newValue],
-				['lazy', null],
-				['sensitive', null],
-				['no-interaction', true],
-			]);
-		$this->consoleInput->method('hasParameterOption')
-			->willReturnMap([
-				['--type', false, false],
-				['--value', false, true],
-				['--update-only', false, $updateOnly]
-			]);
-		$this->consoleOutput->method('writeln')
-			->with($this->stringContains($expectedMessage));
+        $this->consoleInput->expects($this->exactly(2))
+            ->method('getArgument')
+            ->willReturnMap([
+                ['app', 'app-name'],
+                ['name', $configName],
+            ]);
+        $this->consoleInput->method('getOption')
+            ->willReturnMap([
+                ['value', $newValue],
+                ['lazy', null],
+                ['sensitive', null],
+                ['no-interaction', true],
+            ]);
+        $this->consoleInput->method('hasParameterOption')
+            ->willReturnMap([
+                ['--type', false, false],
+                ['--value', false, true],
+                ['--update-only', false, $updateOnly]
+            ]);
+        $this->consoleOutput->method('writeln')
+            ->with($this->stringContains($expectedMessage));
 
-		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
+        self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+    }
 }

tests/Core/Command/Config/App/GetConfigTest.php

Indentation +115 added lines, -115 removed lines

@@ -19,119 +19,119 @@
 use Test\TestCase;
 
 class GetConfigTest extends TestCase {
-	protected IAppConfig&MockObject $appConfig;
-	protected InputInterface&MockObject $consoleInput;
-	protected OutputInterface&MockObject $consoleOutput;
-	protected Command $command;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->consoleInput = $this->createMock(InputInterface::class);
-		$this->consoleOutput = $this->createMock(OutputInterface::class);
-
-		$this->command = new GetConfig($this->appConfig);
-	}
-
-
-	public static function dataGet(): array {
-		return [
-			// String output as json
-			['name', 'newvalue', true, null, false, 'json', 0, json_encode('newvalue')],
-			// String output as plain text
-			['name', 'newvalue', true, null, false, 'plain', 0, 'newvalue'],
-			// String falling back to default output as json
-			['name', null, false, 'newvalue', true, 'json', 0, json_encode('newvalue')],
-			// String falling back without default: error
-			['name', null, false, null, false, 'json', 1, null],
-
-			// Int "0" output as json/plain
-			['name', 0, true, null, false, 'json', 0, json_encode(0)],
-			['name', 0, true, null, false, 'plain', 0, '0'],
-			// Int "1" output as json/plain
-			['name', 1, true, null, false, 'json', 0, json_encode(1)],
-			['name', 1, true, null, false, 'plain', 0, '1'],
-
-			// Bool "true" output as json/plain
-			['name', true, true, null, false, 'json', 0, json_encode(true)],
-			['name', true, true, null, false, 'plain', 0, 'true'],
-			// Bool "false" output as json/plain
-			['name', false, true, null, false, 'json', 0, json_encode(false)],
-			['name', false, true, null, false, 'plain', 0, 'false'],
-
-			// Null output as json/plain
-			['name', null, true, null, false, 'json', 0, json_encode(null)],
-			['name', null, true, null, false, 'plain', 0, 'null'],
-
-			// Array output as json/plain
-			['name', ['a', 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
-			['name', ['a', 'b'], true, null, false, 'plain', 0, "a\nb"],
-			// Key array output as json/plain
-			['name', [0 => 'a', 1 => 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
-			['name', [0 => 'a', 1 => 'b'], true, null, false, 'plain', 0, "a\nb"],
-			// Associative array output as json/plain
-			['name', ['a' => 1, 'b' => 2], true, null, false, 'json', 0, json_encode(['a' => 1, 'b' => 2])],
-			['name', ['a' => 1, 'b' => 2], true, null, false, 'plain', 0, "a: 1\nb: 2"],
-
-		];
-	}
-
-	/**
-	 * @dataProvider dataGet
-	 */
-	public function testGet(string $configName, mixed $value, bool $configExists, mixed $defaultValue, bool $hasDefault, string $outputFormat, int $expectedReturn, ?string $expectedMessage): void {
-		if (!$expectedReturn) {
-			if ($configExists) {
-				$this->appConfig->expects($this->once())
-					->method('getDetails')
-					->with('app-name', $configName)
-					->willReturn(['value' => $value]);
-			}
-		}
-
-		if (!$configExists) {
-			$this->appConfig->expects($this->once())
-				->method('getDetails')
-				->with('app-name', $configName)
-				->willThrowException(new AppConfigUnknownKeyException());
-		}
-
-		$this->consoleInput->expects($this->exactly(2))
-			->method('getArgument')
-			->willReturnMap([
-				['app', 'app-name'],
-				['name', $configName],
-			]);
-		$this->consoleInput->method('getOption')
-			->willReturnMap([
-				['default-value', $defaultValue],
-				['output', $outputFormat],
-			]);
-		$this->consoleInput->method('hasParameterOption')
-			->willReturnMap([
-				['--output', false, true],
-				['--default-value', false, $hasDefault],
-			]);
-
-		if ($expectedMessage !== null) {
-			global $output;
-
-			$output = '';
-			$this->consoleOutput->method('writeln')
-				->willReturnCallback(function ($value) {
-					global $output;
-					$output .= $value . "\n";
-					return $output;
-				});
-		}
-
-		$this->assertSame($expectedReturn, self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
-
-		if ($expectedMessage !== null) {
-			global $output;
-			// Remove the trailing newline
-			$this->assertSame($expectedMessage, substr($output, 0, -1));
-		}
-	}
+    protected IAppConfig&MockObject $appConfig;
+    protected InputInterface&MockObject $consoleInput;
+    protected OutputInterface&MockObject $consoleOutput;
+    protected Command $command;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->consoleInput = $this->createMock(InputInterface::class);
+        $this->consoleOutput = $this->createMock(OutputInterface::class);
+
+        $this->command = new GetConfig($this->appConfig);
+    }
+
+
+    public static function dataGet(): array {
+        return [
+            // String output as json
+            ['name', 'newvalue', true, null, false, 'json', 0, json_encode('newvalue')],
+            // String output as plain text
+            ['name', 'newvalue', true, null, false, 'plain', 0, 'newvalue'],
+            // String falling back to default output as json
+            ['name', null, false, 'newvalue', true, 'json', 0, json_encode('newvalue')],
+            // String falling back without default: error
+            ['name', null, false, null, false, 'json', 1, null],
+
+            // Int "0" output as json/plain
+            ['name', 0, true, null, false, 'json', 0, json_encode(0)],
+            ['name', 0, true, null, false, 'plain', 0, '0'],
+            // Int "1" output as json/plain
+            ['name', 1, true, null, false, 'json', 0, json_encode(1)],
+            ['name', 1, true, null, false, 'plain', 0, '1'],
+
+            // Bool "true" output as json/plain
+            ['name', true, true, null, false, 'json', 0, json_encode(true)],
+            ['name', true, true, null, false, 'plain', 0, 'true'],
+            // Bool "false" output as json/plain
+            ['name', false, true, null, false, 'json', 0, json_encode(false)],
+            ['name', false, true, null, false, 'plain', 0, 'false'],
+
+            // Null output as json/plain
+            ['name', null, true, null, false, 'json', 0, json_encode(null)],
+            ['name', null, true, null, false, 'plain', 0, 'null'],
+
+            // Array output as json/plain
+            ['name', ['a', 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
+            ['name', ['a', 'b'], true, null, false, 'plain', 0, "a\nb"],
+            // Key array output as json/plain
+            ['name', [0 => 'a', 1 => 'b'], true, null, false, 'json', 0, json_encode(['a', 'b'])],
+            ['name', [0 => 'a', 1 => 'b'], true, null, false, 'plain', 0, "a\nb"],
+            // Associative array output as json/plain
+            ['name', ['a' => 1, 'b' => 2], true, null, false, 'json', 0, json_encode(['a' => 1, 'b' => 2])],
+            ['name', ['a' => 1, 'b' => 2], true, null, false, 'plain', 0, "a: 1\nb: 2"],
+
+        ];
+    }
+
+    /**
+     * @dataProvider dataGet
+     */
+    public function testGet(string $configName, mixed $value, bool $configExists, mixed $defaultValue, bool $hasDefault, string $outputFormat, int $expectedReturn, ?string $expectedMessage): void {
+        if (!$expectedReturn) {
+            if ($configExists) {
+                $this->appConfig->expects($this->once())
+                    ->method('getDetails')
+                    ->with('app-name', $configName)
+                    ->willReturn(['value' => $value]);
+            }
+        }
+
+        if (!$configExists) {
+            $this->appConfig->expects($this->once())
+                ->method('getDetails')
+                ->with('app-name', $configName)
+                ->willThrowException(new AppConfigUnknownKeyException());
+        }
+
+        $this->consoleInput->expects($this->exactly(2))
+            ->method('getArgument')
+            ->willReturnMap([
+                ['app', 'app-name'],
+                ['name', $configName],
+            ]);
+        $this->consoleInput->method('getOption')
+            ->willReturnMap([
+                ['default-value', $defaultValue],
+                ['output', $outputFormat],
+            ]);
+        $this->consoleInput->method('hasParameterOption')
+            ->willReturnMap([
+                ['--output', false, true],
+                ['--default-value', false, $hasDefault],
+            ]);
+
+        if ($expectedMessage !== null) {
+            global $output;
+
+            $output = '';
+            $this->consoleOutput->method('writeln')
+                ->willReturnCallback(function ($value) {
+                    global $output;
+                    $output .= $value . "\n";
+                    return $output;
+                });
+        }
+
+        $this->assertSame($expectedReturn, self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]));
+
+        if ($expectedMessage !== null) {
+            global $output;
+            // Remove the trailing newline
+            $this->assertSame($expectedMessage, substr($output, 0, -1));
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -119,9 +119,9 @@
 
 			$output = '';
 			$this->consoleOutput->method('writeln')
-				->willReturnCallback(function ($value) {
+				->willReturnCallback(function($value) {
 					global $output;
-					$output .= $value . "\n";
+					$output .= $value."\n";
 					return $output;
 				});
 		}

core/Command/Config/App/Base.php

Indentation +20 added lines, -20 removed lines

@@ -11,26 +11,26 @@
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 abstract class Base extends \OC\Core\Command\Base {
-	public function __construct(
-		protected IAppConfig $appConfig,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IAppConfig $appConfig,
+    ) {
+        parent::__construct();
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return $this->appConfig->getApps();
-		}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return $this->appConfig->getApps();
+        }
 
-		if ($argumentName === 'name') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			return $this->appConfig->getKeys($appName);
-		}
-		return [];
-	}
+        if ($argumentName === 'name') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+            return $this->appConfig->getKeys($appName);
+        }
+        return [];
+    }
 }

core/Command/Config/App/SetConfig.php

Indentation +227 added lines, -227 removed lines

@@ -20,231 +20,231 @@
 use Symfony\Component\Console\Question\Question;
 
 class SetConfig extends Base {
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:app:set')
-			->setDescription('Set an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to set'
-			)
-			->addOption(
-				'value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The new value of the config'
-			)
-			->addOption(
-				'type',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Value type [string, integer, float, boolean, array]',
-				'string'
-			)
-			->addOption(
-				'lazy',
-				null,
-				InputOption::VALUE_NEGATABLE,
-				'Set value as lazy loaded',
-			)
-			->addOption(
-				'sensitive',
-				null,
-				InputOption::VALUE_NEGATABLE,
-				'Set value as sensitive',
-			)
-			->addOption(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
-
-		if (!($this->appConfig instanceof AppConfig)) {
-			throw new \Exception('Only compatible with OC\AppConfig as it uses internal methods');
-		}
-
-		if ($input->hasParameterOption('--update-only') && !$this->appConfig->hasKey($appName, $configName)) {
-			$output->writeln(
-				'<comment>Config value ' . $configName . ' for app ' . $appName
-				. ' not updated, as it has not been set before.</comment>'
-			);
-
-			return 1;
-		}
-
-		$type = $typeString = null;
-		if ($input->hasParameterOption('--type')) {
-			$typeString = $input->getOption('type');
-			$type = $this->appConfig->convertTypeToInt($typeString);
-		}
-
-		/**
-		 * If --Value is not specified, returns an exception if no value exists in database
-		 * compare with current status in database and displays a reminder that this can break things.
-		 * confirmation is required by admin, unless --no-interaction
-		 */
-		$updated = false;
-		if (!$input->hasParameterOption('--value')) {
-			if (!$input->getOption('lazy') && $this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'NOT LAZY')) {
-				$updated = $this->appConfig->updateLazy($appName, $configName, false);
-			}
-			if ($input->getOption('lazy') && !$this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'LAZY')) {
-				$updated = $this->appConfig->updateLazy($appName, $configName, true) || $updated;
-			}
-			if (!$input->getOption('sensitive') && $this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'NOT SENSITIVE')) {
-				$updated = $this->appConfig->updateSensitive($appName, $configName, false) || $updated;
-			}
-			if ($input->getOption('sensitive') && !$this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'SENSITIVE')) {
-				$updated = $this->appConfig->updateSensitive($appName, $configName, true) || $updated;
-			}
-			if ($type !== null && $type !== $this->appConfig->getValueType($appName, $configName) && $typeString !== null && $this->ask($input, $output, $typeString)) {
-				$updated = $this->appConfig->updateType($appName, $configName, $type) || $updated;
-			}
-		} else {
-			/**
-			 * If --type is specified in the command line, we upgrade the type in database
-			 * after a confirmation from admin.
-			 * If not we get the type from current stored value or VALUE_MIXED as default.
-			 */
-			try {
-				$currType = $this->appConfig->getValueType($appName, $configName);
-				if ($type === null || $typeString === null || $type === $currType || !$this->ask($input, $output, $typeString)) {
-					$type = $currType;
-				} else {
-					$updated = $this->appConfig->updateType($appName, $configName, $type);
-				}
-			} catch (AppConfigUnknownKeyException) {
-				$type = $type ?? IAppConfig::VALUE_MIXED;
-			}
-
-			/**
-			 * if --lazy/--no-lazy option are set, compare with data stored in database.
-			 * If no data in database, or identical, continue.
-			 * If different, ask admin for confirmation.
-			 */
-			$lazy = $input->getOption('lazy');
-			try {
-				$currLazy = $this->appConfig->isLazy($appName, $configName);
-				if ($lazy === null || $lazy === $currLazy || !$this->ask($input, $output, ($lazy) ? 'LAZY' : 'NOT LAZY')) {
-					$lazy = $currLazy;
-				}
-			} catch (AppConfigUnknownKeyException) {
-				$lazy = $lazy ?? false;
-			}
-
-			/**
-			 * same with sensitive status
-			 */
-			$sensitive = $input->getOption('sensitive');
-			try {
-				$currSensitive = $this->appConfig->isSensitive($appName, $configName, null);
-				if ($sensitive === null || $sensitive === $currSensitive || !$this->ask($input, $output, ($sensitive) ? 'SENSITIVE' : 'NOT SENSITIVE')) {
-					$sensitive = $currSensitive;
-				}
-			} catch (AppConfigUnknownKeyException) {
-				$sensitive = $sensitive ?? false;
-			}
-
-			$value = (string)$input->getOption('value');
-
-			switch ($type) {
-				case IAppConfig::VALUE_MIXED:
-					$updated = $this->appConfig->setValueMixed($appName, $configName, $value, $lazy, $sensitive);
-					break;
-
-				case IAppConfig::VALUE_STRING:
-					$updated = $this->appConfig->setValueString($appName, $configName, $value, $lazy, $sensitive);
-					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);
-					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);
-					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);
-					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);
-					break;
-			}
-		}
-
-		if ($updated) {
-			$current = $this->appConfig->getDetails($appName, $configName);
-			$output->writeln(
-				sprintf(
-					"<info>Config value '%s' for app '%s' is now set to '%s', stored as %s in %s</info>",
-					$configName,
-					$appName,
-					$current['sensitive'] ? '<sensitive>' : $current['value'],
-					$current['typeString'],
-					$current['lazy'] ? 'lazy cache' : 'fast cache'
-				)
-			);
-		} else {
-			$output->writeln('<info>Config value were not updated</info>');
-		}
-
-		return 0;
-	}
-
-	private function ask(InputInterface $input, OutputInterface $output, string $request): bool {
-		/** @var QuestionHelper $helper */
-		$helper = $this->getHelper('question');
-		if ($input->getOption('no-interaction')) {
-			return true;
-		}
-
-		$output->writeln(sprintf('You are about to set config value %s as <info>%s</info>',
-			'<info>' . $input->getArgument('app') . '</info>/<info>' . $input->getArgument('name') . '</info>',
-			strtoupper($request)
-		));
-		$output->writeln('');
-		$output->writeln('<comment>This might break thing, affect performance on your instance or its security!</comment>');
-
-		$result = (strtolower((string)$helper->ask(
-			$input,
-			$output,
-			new Question('<comment>Confirm this action by typing \'yes\'</comment>: '))) === 'yes');
-
-		$output->writeln(($result) ? 'done' : 'cancelled');
-		$output->writeln('');
-
-		return $result;
-	}
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:app:set')
+            ->setDescription('Set an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to set'
+            )
+            ->addOption(
+                'value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The new value of the config'
+            )
+            ->addOption(
+                'type',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Value type [string, integer, float, boolean, array]',
+                'string'
+            )
+            ->addOption(
+                'lazy',
+                null,
+                InputOption::VALUE_NEGATABLE,
+                'Set value as lazy loaded',
+            )
+            ->addOption(
+                'sensitive',
+                null,
+                InputOption::VALUE_NEGATABLE,
+                'Set value as sensitive',
+            )
+            ->addOption(
+                'update-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Only updates the value, if it is not set before, it is not being added'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
+
+        if (!($this->appConfig instanceof AppConfig)) {
+            throw new \Exception('Only compatible with OC\AppConfig as it uses internal methods');
+        }
+
+        if ($input->hasParameterOption('--update-only') && !$this->appConfig->hasKey($appName, $configName)) {
+            $output->writeln(
+                '<comment>Config value ' . $configName . ' for app ' . $appName
+                . ' not updated, as it has not been set before.</comment>'
+            );
+
+            return 1;
+        }
+
+        $type = $typeString = null;
+        if ($input->hasParameterOption('--type')) {
+            $typeString = $input->getOption('type');
+            $type = $this->appConfig->convertTypeToInt($typeString);
+        }
+
+        /**
+         * If --Value is not specified, returns an exception if no value exists in database
+         * compare with current status in database and displays a reminder that this can break things.
+         * confirmation is required by admin, unless --no-interaction
+         */
+        $updated = false;
+        if (!$input->hasParameterOption('--value')) {
+            if (!$input->getOption('lazy') && $this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'NOT LAZY')) {
+                $updated = $this->appConfig->updateLazy($appName, $configName, false);
+            }
+            if ($input->getOption('lazy') && !$this->appConfig->isLazy($appName, $configName) && $this->ask($input, $output, 'LAZY')) {
+                $updated = $this->appConfig->updateLazy($appName, $configName, true) || $updated;
+            }
+            if (!$input->getOption('sensitive') && $this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'NOT SENSITIVE')) {
+                $updated = $this->appConfig->updateSensitive($appName, $configName, false) || $updated;
+            }
+            if ($input->getOption('sensitive') && !$this->appConfig->isSensitive($appName, $configName) && $this->ask($input, $output, 'SENSITIVE')) {
+                $updated = $this->appConfig->updateSensitive($appName, $configName, true) || $updated;
+            }
+            if ($type !== null && $type !== $this->appConfig->getValueType($appName, $configName) && $typeString !== null && $this->ask($input, $output, $typeString)) {
+                $updated = $this->appConfig->updateType($appName, $configName, $type) || $updated;
+            }
+        } else {
+            /**
+             * If --type is specified in the command line, we upgrade the type in database
+             * after a confirmation from admin.
+             * If not we get the type from current stored value or VALUE_MIXED as default.
+             */
+            try {
+                $currType = $this->appConfig->getValueType($appName, $configName);
+                if ($type === null || $typeString === null || $type === $currType || !$this->ask($input, $output, $typeString)) {
+                    $type = $currType;
+                } else {
+                    $updated = $this->appConfig->updateType($appName, $configName, $type);
+                }
+            } catch (AppConfigUnknownKeyException) {
+                $type = $type ?? IAppConfig::VALUE_MIXED;
+            }
+
+            /**
+             * if --lazy/--no-lazy option are set, compare with data stored in database.
+             * If no data in database, or identical, continue.
+             * If different, ask admin for confirmation.
+             */
+            $lazy = $input->getOption('lazy');
+            try {
+                $currLazy = $this->appConfig->isLazy($appName, $configName);
+                if ($lazy === null || $lazy === $currLazy || !$this->ask($input, $output, ($lazy) ? 'LAZY' : 'NOT LAZY')) {
+                    $lazy = $currLazy;
+                }
+            } catch (AppConfigUnknownKeyException) {
+                $lazy = $lazy ?? false;
+            }
+
+            /**
+             * same with sensitive status
+             */
+            $sensitive = $input->getOption('sensitive');
+            try {
+                $currSensitive = $this->appConfig->isSensitive($appName, $configName, null);
+                if ($sensitive === null || $sensitive === $currSensitive || !$this->ask($input, $output, ($sensitive) ? 'SENSITIVE' : 'NOT SENSITIVE')) {
+                    $sensitive = $currSensitive;
+                }
+            } catch (AppConfigUnknownKeyException) {
+                $sensitive = $sensitive ?? false;
+            }
+
+            $value = (string)$input->getOption('value');
+
+            switch ($type) {
+                case IAppConfig::VALUE_MIXED:
+                    $updated = $this->appConfig->setValueMixed($appName, $configName, $value, $lazy, $sensitive);
+                    break;
+
+                case IAppConfig::VALUE_STRING:
+                    $updated = $this->appConfig->setValueString($appName, $configName, $value, $lazy, $sensitive);
+                    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);
+                    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);
+                    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);
+                    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);
+                    break;
+            }
+        }
+
+        if ($updated) {
+            $current = $this->appConfig->getDetails($appName, $configName);
+            $output->writeln(
+                sprintf(
+                    "<info>Config value '%s' for app '%s' is now set to '%s', stored as %s in %s</info>",
+                    $configName,
+                    $appName,
+                    $current['sensitive'] ? '<sensitive>' : $current['value'],
+                    $current['typeString'],
+                    $current['lazy'] ? 'lazy cache' : 'fast cache'
+                )
+            );
+        } else {
+            $output->writeln('<info>Config value were not updated</info>');
+        }
+
+        return 0;
+    }
+
+    private function ask(InputInterface $input, OutputInterface $output, string $request): bool {
+        /** @var QuestionHelper $helper */
+        $helper = $this->getHelper('question');
+        if ($input->getOption('no-interaction')) {
+            return true;
+        }
+
+        $output->writeln(sprintf('You are about to set config value %s as <info>%s</info>',
+            '<info>' . $input->getArgument('app') . '</info>/<info>' . $input->getArgument('name') . '</info>',
+            strtoupper($request)
+        ));
+        $output->writeln('');
+        $output->writeln('<comment>This might break thing, affect performance on your instance or its security!</comment>');
+
+        $result = (strtolower((string)$helper->ask(
+            $input,
+            $output,
+            new Question('<comment>Confirm this action by typing \'yes\'</comment>: '))) === 'yes');
+
+        $output->writeln(($result) ? 'done' : 'cancelled');
+        $output->writeln('');
+
+        return $result;
+    }
 }

core/Command/Config/App/DeleteConfig.php

Indentation +34 added lines, -34 removed lines

@@ -14,42 +14,42 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:app:delete')
-			->setDescription('Delete an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to delete'
-			)
-			->addOption(
-				'error-if-not-exists',
-				null,
-				InputOption::VALUE_NONE,
-				'Checks whether the config exists before deleting it'
-			)
-		;
-	}
+        $this
+            ->setName('config:app:delete')
+            ->setDescription('Delete an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to delete'
+            )
+            ->addOption(
+                'error-if-not-exists',
+                null,
+                InputOption::VALUE_NONE,
+                'Checks whether the config exists before deleting it'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
 
-		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;
-		}
+        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->appConfig->deleteKey($appName, $configName);
-		$output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
-		return 0;
-	}
+        $this->appConfig->deleteKey($appName, $configName);
+        $output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -44,12 +44,12 @@
 		$configName = $input->getArgument('name');
 
 		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>');
+			$output->writeln('<error>Config '.$configName.' of app '.$appName.' could not be deleted because it did not exist</error>');
 			return 1;
 		}
 
 		$this->appConfig->deleteKey($appName, $configName);
-		$output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
+		$output->writeln('<info>Config value '.$configName.' of app '.$appName.' deleted</info>');
 		return 0;
 	}
 }

core/Command/Config/App/GetConfig.php

Indentation +58 added lines, -58 removed lines

@@ -15,67 +15,67 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:app:get')
-			->setDescription('Get an app config value')
-			->addArgument(
-				'app',
-				InputArgument::REQUIRED,
-				'Name of the app'
-			)
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'Name of the config to get'
-			)
-			->addOption(
-				'details',
-				null,
-				InputOption::VALUE_NONE,
-				'returns complete details about the app config value'
-			)
-			->addOption(
-				'default-value',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'If no default value is set and the config does not exist, the command will exit with 1'
-			)
-		;
-	}
+        $this
+            ->setName('config:app:get')
+            ->setDescription('Get an app config value')
+            ->addArgument(
+                'app',
+                InputArgument::REQUIRED,
+                'Name of the app'
+            )
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'Name of the config to get'
+            )
+            ->addOption(
+                'details',
+                null,
+                InputOption::VALUE_NONE,
+                'returns complete details about the app config value'
+            )
+            ->addOption(
+                'default-value',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'If no default value is set and the config does not exist, the command will exit with 1'
+            )
+        ;
+    }
 
-	/**
-	 * Executes the current command.
-	 *
-	 * @param InputInterface $input An InputInterface instance
-	 * @param OutputInterface $output An OutputInterface instance
-	 * @return int 0 if everything went fine, or an error code
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
-		$defaultValue = $input->getOption('default-value');
+    /**
+     * Executes the current command.
+     *
+     * @param InputInterface $input An InputInterface instance
+     * @param OutputInterface $output An OutputInterface instance
+     * @return int 0 if everything went fine, or an error code
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
+        $defaultValue = $input->getOption('default-value');
 
-		if ($input->getOption('details')) {
-			$details = $this->appConfig->getDetails($appName, $configName);
-			$details['type'] = $details['typeString'];
-			unset($details['typeString']);
-			$this->writeArrayInOutputFormat($input, $output, $details);
-			return 0;
-		}
+        if ($input->getOption('details')) {
+            $details = $this->appConfig->getDetails($appName, $configName);
+            $details['type'] = $details['typeString'];
+            unset($details['typeString']);
+            $this->writeArrayInOutputFormat($input, $output, $details);
+            return 0;
+        }
 
-		try {
-			$configValue = $this->appConfig->getDetails($appName, $configName)['value'];
-		} catch (AppConfigUnknownKeyException $e) {
-			if (!$input->hasParameterOption('--default-value')) {
-				return 1;
-			}
-			$configValue = $defaultValue;
-		}
+        try {
+            $configValue = $this->appConfig->getDetails($appName, $configName)['value'];
+        } catch (AppConfigUnknownKeyException $e) {
+            if (!$input->hasParameterOption('--default-value')) {
+                return 1;
+            }
+            $configValue = $defaultValue;
+        }
 
-		$this->writeMixedInOutputFormat($input, $output, $configValue);
-		return 0;
-	}
+        $this->writeMixedInOutputFormat($input, $output, $configValue);
+        return 0;
+    }
 }