nextcloud / server

core/Command/Security/ImportCertificate.php

Indentation +26 added lines, -26 removed lines

@@ -33,36 +33,36 @@
 
 class ImportCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
+    /** @var ICertificateManager */
+    protected $certificateManager;
 
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates:import')
-			->setDescription('import trusted certificate')
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to the certificate to import'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates:import')
+            ->setDescription('import trusted certificate')
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to the certificate to import'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getArgument('path');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getArgument('path');
 
-		if (!file_exists($path)) {
-			$output->writeln('<error>certificate not found</error>');
-			return;
-		}
+        if (!file_exists($path)) {
+            $output->writeln('<error>certificate not found</error>');
+            return;
+        }
 
-		$certData = file_get_contents($path);
-		$name = basename($path);
+        $certData = file_get_contents($path);
+        $name = basename($path);
 
-		$this->certificateManager->addCertificate($certData, $name);
-	}
+        $this->certificateManager->addCertificate($certData, $name);
+    }
 }

core/Command/User/ResetPassword.php

Spacing +2 added lines, -2 removed lines

@@ -117,12 +117,12 @@
 		try {
 			$success = $user->setPassword($password);
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return 1;
 		}
 
 		if ($success) {
-			$output->writeln("<info>Successfully reset password for " . $username . "</info>");
+			$output->writeln("<info>Successfully reset password for ".$username."</info>");
 		} else {
 			$output->writeln("<error>Error while resetting password!</error>");
 			return 1;

Indentation +94 added lines, -94 removed lines

@@ -39,98 +39,98 @@
 
 class ResetPassword extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('user:resetpassword')
-			->setDescription('Resets the password of the named user')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'Username to reset password'
-			)
-			->addOption(
-				'password-from-env',
-				null,
-				InputOption::VALUE_NONE,
-				'read password from environment variable OC_PASS'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$username = $input->getArgument('user');
-
-		/** @var $user \OCP\IUser */
-		$user = $this->userManager->get($username);
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 1;
-		}
-
-		if ($input->getOption('password-from-env')) {
-			$password = getenv('OC_PASS');
-			if (!$password) {
-				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
-				return 1;
-			}
-		} elseif ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (\OCP\App::isEnabled('encryption')) {
-				$output->writeln(
-					'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
-				);
-
-				$question = new ConfirmationQuestion('Do you want to continue?');
-				if (!$helper->ask($input, $output, $question)) {
-					return 1;
-				}
-			}
-
-			$question = new Question('Enter a new password: ');
-			$question->setHidden(true);
-			$password = $helper->ask($input, $output, $question);
-
-			if ($password === null) {
-				$output->writeln("<error>Password cannot be empty!</error>");
-				return 1;
-			}
-
-			$question = new Question('Confirm the new password: ');
-			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output, $question);
-
-			if ($password !== $confirm) {
-				$output->writeln("<error>Passwords did not match!</error>");
-				return 1;
-			}
-		} else {
-			$output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
-			return 1;
-		}
-
-
-		try {
-			$success = $user->setPassword($password);
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-		if ($success) {
-			$output->writeln("<info>Successfully reset password for " . $username . "</info>");
-		} else {
-			$output->writeln("<error>Error while resetting password!</error>");
-			return 1;
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('user:resetpassword')
+            ->setDescription('Resets the password of the named user')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'Username to reset password'
+            )
+            ->addOption(
+                'password-from-env',
+                null,
+                InputOption::VALUE_NONE,
+                'read password from environment variable OC_PASS'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $username = $input->getArgument('user');
+
+        /** @var $user \OCP\IUser */
+        $user = $this->userManager->get($username);
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 1;
+        }
+
+        if ($input->getOption('password-from-env')) {
+            $password = getenv('OC_PASS');
+            if (!$password) {
+                $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
+                return 1;
+            }
+        } elseif ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (\OCP\App::isEnabled('encryption')) {
+                $output->writeln(
+                    '<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
+                );
+
+                $question = new ConfirmationQuestion('Do you want to continue?');
+                if (!$helper->ask($input, $output, $question)) {
+                    return 1;
+                }
+            }
+
+            $question = new Question('Enter a new password: ');
+            $question->setHidden(true);
+            $password = $helper->ask($input, $output, $question);
+
+            if ($password === null) {
+                $output->writeln("<error>Password cannot be empty!</error>");
+                return 1;
+            }
+
+            $question = new Question('Confirm the new password: ');
+            $question->setHidden(true);
+            $confirm = $helper->ask($input, $output, $question);
+
+            if ($password !== $confirm) {
+                $output->writeln("<error>Passwords did not match!</error>");
+                return 1;
+            }
+        } else {
+            $output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
+            return 1;
+        }
+
+
+        try {
+            $success = $user->setPassword($password);
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+        if ($success) {
+            $output->writeln("<info>Successfully reset password for " . $username . "</info>");
+        } else {
+            $output->writeln("<error>Error while resetting password!</error>");
+            return 1;
+        }
+    }
 }

core/Command/Config/ListConfigs.php

Indentation +123 added lines, -123 removed lines

@@ -32,127 +32,127 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListConfigs extends Base {
-	protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
-
-	/** * @var SystemConfig */
-	protected $systemConfig;
-
-	/** @var IAppConfig */
-	protected $appConfig;
-
-	/**
-	 * @param SystemConfig $systemConfig
-	 * @param IAppConfig $appConfig
-	 */
-	public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-		$this->appConfig = $appConfig;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:list')
-			->setDescription('List all configs')
-			->addArgument(
-				'app',
-				InputArgument::OPTIONAL,
-				'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
-				'all'
-			)
-			->addOption(
-				'private',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option when you want to include sensitive configs like passwords, salts, ...'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$app = $input->getArgument('app');
-		$noSensitiveValues = !$input->getOption('private');
-
-		switch ($app) {
-			case 'system':
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-				];
-			break;
-
-			case 'all':
-				$apps = $this->appConfig->getApps();
-				$configs = [
-					'system' => $this->getSystemConfigs($noSensitiveValues),
-					'apps' => [],
-				];
-				foreach ($apps as $appName) {
-					$configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
-				}
-			break;
-
-			default:
-				$configs = [
-					'apps' => [
-						$app => $this->getAppConfigs($app, $noSensitiveValues),
-					],
-				];
-		}
-
-		$this->writeArrayInOutputFormat($input, $output, $configs);
-	}
-
-	/**
-	 * Get the system configs
-	 *
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getSystemConfigs($noSensitiveValues) {
-		$keys = $this->systemConfig->getKeys();
-
-		$configs = [];
-		foreach ($keys as $key) {
-			if ($noSensitiveValues) {
-				$value = $this->systemConfig->getFilteredValue($key, serialize(null));
-			} else {
-				$value = $this->systemConfig->getValue($key, serialize(null));
-			}
-
-			if ($value !== 'N;') {
-				$configs[$key] = $value;
-			}
-		}
-
-		return $configs;
-	}
-
-	/**
-	 * Get the app configs
-	 *
-	 * @param string $app
-	 * @param bool $noSensitiveValues
-	 * @return array
-	 */
-	protected function getAppConfigs($app, $noSensitiveValues) {
-		if ($noSensitiveValues) {
-			return $this->appConfig->getFilteredValues($app, false);
-		} else {
-			return $this->appConfig->getValues($app, false);
-		}
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return array_merge(['all', 'system'], \OC_App::getAllApps());
-		}
-		return [];
-	}
+    protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
+
+    /** * @var SystemConfig */
+    protected $systemConfig;
+
+    /** @var IAppConfig */
+    protected $appConfig;
+
+    /**
+     * @param SystemConfig $systemConfig
+     * @param IAppConfig $appConfig
+     */
+    public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+        $this->appConfig = $appConfig;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:list')
+            ->setDescription('List all configs')
+            ->addArgument(
+                'app',
+                InputArgument::OPTIONAL,
+                'Name of the app ("system" to get the config.php values, "all" for all apps and system)',
+                'all'
+            )
+            ->addOption(
+                'private',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option when you want to include sensitive configs like passwords, salts, ...'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $app = $input->getArgument('app');
+        $noSensitiveValues = !$input->getOption('private');
+
+        switch ($app) {
+            case 'system':
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                ];
+            break;
+
+            case 'all':
+                $apps = $this->appConfig->getApps();
+                $configs = [
+                    'system' => $this->getSystemConfigs($noSensitiveValues),
+                    'apps' => [],
+                ];
+                foreach ($apps as $appName) {
+                    $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
+                }
+            break;
+
+            default:
+                $configs = [
+                    'apps' => [
+                        $app => $this->getAppConfigs($app, $noSensitiveValues),
+                    ],
+                ];
+        }
+
+        $this->writeArrayInOutputFormat($input, $output, $configs);
+    }
+
+    /**
+     * Get the system configs
+     *
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getSystemConfigs($noSensitiveValues) {
+        $keys = $this->systemConfig->getKeys();
+
+        $configs = [];
+        foreach ($keys as $key) {
+            if ($noSensitiveValues) {
+                $value = $this->systemConfig->getFilteredValue($key, serialize(null));
+            } else {
+                $value = $this->systemConfig->getValue($key, serialize(null));
+            }
+
+            if ($value !== 'N;') {
+                $configs[$key] = $value;
+            }
+        }
+
+        return $configs;
+    }
+
+    /**
+     * Get the app configs
+     *
+     * @param string $app
+     * @param bool $noSensitiveValues
+     * @return array
+     */
+    protected function getAppConfigs($app, $noSensitiveValues) {
+        if ($noSensitiveValues) {
+            return $this->appConfig->getFilteredValues($app, false);
+        } else {
+            return $this->appConfig->getValues($app, false);
+        }
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return array_merge(['all', 'system'], \OC_App::getAllApps());
+        }
+        return [];
+    }
 }

core/Command/Config/System/Base.php

Indentation +43 added lines, -43 removed lines

@@ -26,53 +26,53 @@
 
 abstract class Base extends \OC\Core\Command\Base {
 
-	/** @var SystemConfig */
-	protected $systemConfig;
+    /** @var SystemConfig */
+    protected $systemConfig;
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'name') {
-			$words = $this->getPreviousNames($context, $context->getWordIndex());
-			if (empty($words)) {
-				$completions = $this->systemConfig->getKeys();
-			} else {
-				$key = array_shift($words);
-				$value = $this->systemConfig->getValue($key);
-				$completions = array_keys($value);
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'name') {
+            $words = $this->getPreviousNames($context, $context->getWordIndex());
+            if (empty($words)) {
+                $completions = $this->systemConfig->getKeys();
+            } else {
+                $key = array_shift($words);
+                $value = $this->systemConfig->getValue($key);
+                $completions = array_keys($value);
 
-				while (!empty($words) && is_array($value)) {
-					$key = array_shift($words);
-					if (!isset($value[$key]) || !is_array($value[$key])) {
-						break;
-					}
+                while (!empty($words) && is_array($value)) {
+                    $key = array_shift($words);
+                    if (!isset($value[$key]) || !is_array($value[$key])) {
+                        break;
+                    }
 
-					$value = $value[$key];
-					$completions = array_keys($value);
-				}
-			}
+                    $value = $value[$key];
+                    $completions = array_keys($value);
+                }
+            }
 
-			return $completions;
-		}
-		return parent::completeArgumentValues($argumentName, $context);
-	}
+            return $completions;
+        }
+        return parent::completeArgumentValues($argumentName, $context);
+    }
 
-	/**
-	 * @param CompletionContext $context
-	 * @param int $currentIndex
-	 * @return string[]
-	 */
-	protected function getPreviousNames(CompletionContext $context, $currentIndex) {
-		$word = $context->getWordAtIndex($currentIndex - 1);
-		if ($word === $this->getName() || $currentIndex <= 0) {
-			return [];
-		}
+    /**
+     * @param CompletionContext $context
+     * @param int $currentIndex
+     * @return string[]
+     */
+    protected function getPreviousNames(CompletionContext $context, $currentIndex) {
+        $word = $context->getWordAtIndex($currentIndex - 1);
+        if ($word === $this->getName() || $currentIndex <= 0) {
+            return [];
+        }
 
-		$words = $this->getPreviousNames($context, $currentIndex - 1);
-		$words[] = $word;
-		return $words;
-	}
+        $words = $this->getPreviousNames($context, $currentIndex - 1);
+        $words[] = $word;
+        return $words;
+    }
 }

core/Command/Config/System/SetConfig.php

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
 			$this->systemConfig->setValue($configName, $configValue['value']);
 		}
 
-		$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
+		$output->writeln('<info>System config value '.implode(' => ', $configNames).' set to '.$configValue['readable-value'].'</info>');
 		return 0;
 	}
 
@@ -116,7 +116,7 @@ 
 				}
 				return [
 					'value' => (int) $value,
-					'readable-value' => 'integer ' . (int) $value,
+					'readable-value' => 'integer '.(int) $value,
 				];
 
 			case 'double':
@@ -126,7 +126,7 @@ 
 				}
 				return [
 					'value' => (double) $value,
-					'readable-value' => 'double ' . (double) $value,
+					'readable-value' => 'double '.(double) $value,
 				];
 
 			case 'boolean':
@@ -136,13 +136,13 @@ 
 					case 'true':
 						return [
 							'value' => true,
-							'readable-value' => 'boolean ' . $value,
+							'readable-value' => 'boolean '.$value,
 						];
 
 					case 'false':
 						return [
 							'value' => false,
-							'readable-value' => 'boolean ' . $value,
+							'readable-value' => 'boolean '.$value,
 						];
 
 					default:
@@ -159,7 +159,7 @@ 
 				$value = (string) $value;
 				return [
 					'value' => $value,
-					'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
+					'readable-value' => ($value === '') ? 'empty string' : 'string '.$value,
 				];
 
 			default:

Indentation +177 added lines, -177 removed lines

@@ -32,181 +32,181 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	/** * @var SystemConfig */
-	protected $systemConfig;
-
-	/**
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('config:system:set')
-			->setDescription('Set a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config parameter, specify multiple for array parameter'
-			)
-			->addOption(
-				'type',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'Value type [string, integer, double, boolean]',
-				'string'
-			)
-			->addOption(
-				'value',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'The new value of the config'
-			)
-			->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) {
-		$configNames = $input->getArgument('name');
-		$configName = $configNames[0];
-		$configValue = $this->castValue($input->getOption('value'), $input->getOption('type'));
-		$updateOnly = $input->getOption('update-only');
-
-		if (count($configNames) > 1) {
-			$existingValue = $this->systemConfig->getValue($configName);
-
-			$newValue = $this->mergeArrayValue(
-				array_slice($configNames, 1), $existingValue, $configValue['value'], $updateOnly
-			);
-
-			$this->systemConfig->setValue($configName, $newValue);
-		} else {
-			if ($updateOnly && !in_array($configName, $this->systemConfig->getKeys(), true)) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-
-			$this->systemConfig->setValue($configName, $configValue['value']);
-		}
-
-		$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
-		return 0;
-	}
-
-	/**
-	 * @param string $value
-	 * @param string $type
-	 * @return mixed
-	 * @throws \InvalidArgumentException
-	 */
-	protected function castValue($value, $type) {
-		switch ($type) {
-			case 'integer':
-			case 'int':
-				if (!is_numeric($value)) {
-					throw new \InvalidArgumentException('Non-numeric value specified');
-				}
-				return [
-					'value' => (int) $value,
-					'readable-value' => 'integer ' . (int) $value,
-				];
-
-			case 'double':
-			case 'float':
-				if (!is_numeric($value)) {
-					throw new \InvalidArgumentException('Non-numeric value specified');
-				}
-				return [
-					'value' => (double) $value,
-					'readable-value' => 'double ' . (double) $value,
-				];
-
-			case 'boolean':
-			case 'bool':
-				$value = strtolower($value);
-				switch ($value) {
-					case 'true':
-						return [
-							'value' => true,
-							'readable-value' => 'boolean ' . $value,
-						];
-
-					case 'false':
-						return [
-							'value' => false,
-							'readable-value' => 'boolean ' . $value,
-						];
-
-					default:
-						throw new \InvalidArgumentException('Unable to parse value as boolean');
-				}
-
-				// no break
-			case 'null':
-				return [
-					'value' => null,
-					'readable-value' => 'null',
-				];
-
-			case 'string':
-				$value = (string) $value;
-				return [
-					'value' => $value,
-					'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
-				];
-
-			default:
-				throw new \InvalidArgumentException('Invalid type');
-		}
-	}
-
-	/**
-	 * @param array $configNames
-	 * @param mixed $existingValues
-	 * @param mixed $value
-	 * @param bool $updateOnly
-	 * @return array merged value
-	 * @throws \UnexpectedValueException
-	 */
-	protected function mergeArrayValue(array $configNames, $existingValues, $value, $updateOnly) {
-		$configName = array_shift($configNames);
-		if (!is_array($existingValues)) {
-			$existingValues = [];
-		}
-		if (!empty($configNames)) {
-			if (isset($existingValues[$configName])) {
-				$existingValue = $existingValues[$configName];
-			} else {
-				$existingValue = [];
-			}
-			$existingValues[$configName] = $this->mergeArrayValue($configNames, $existingValue, $value, $updateOnly);
-		} else {
-			if (!isset($existingValues[$configName]) && $updateOnly) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-			$existingValues[$configName] = $value;
-		}
-		return $existingValues;
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		if ($optionName === 'type') {
-			return ['string', 'integer', 'double', 'boolean'];
-		}
-		return parent::completeOptionValues($optionName, $context);
-	}
+    /** * @var SystemConfig */
+    protected $systemConfig;
+
+    /**
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('config:system:set')
+            ->setDescription('Set a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config parameter, specify multiple for array parameter'
+            )
+            ->addOption(
+                'type',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Value type [string, integer, double, boolean]',
+                'string'
+            )
+            ->addOption(
+                'value',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The new value of the config'
+            )
+            ->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) {
+        $configNames = $input->getArgument('name');
+        $configName = $configNames[0];
+        $configValue = $this->castValue($input->getOption('value'), $input->getOption('type'));
+        $updateOnly = $input->getOption('update-only');
+
+        if (count($configNames) > 1) {
+            $existingValue = $this->systemConfig->getValue($configName);
+
+            $newValue = $this->mergeArrayValue(
+                array_slice($configNames, 1), $existingValue, $configValue['value'], $updateOnly
+            );
+
+            $this->systemConfig->setValue($configName, $newValue);
+        } else {
+            if ($updateOnly && !in_array($configName, $this->systemConfig->getKeys(), true)) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+
+            $this->systemConfig->setValue($configName, $configValue['value']);
+        }
+
+        $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' set to ' . $configValue['readable-value'] . '</info>');
+        return 0;
+    }
+
+    /**
+     * @param string $value
+     * @param string $type
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    protected function castValue($value, $type) {
+        switch ($type) {
+            case 'integer':
+            case 'int':
+                if (!is_numeric($value)) {
+                    throw new \InvalidArgumentException('Non-numeric value specified');
+                }
+                return [
+                    'value' => (int) $value,
+                    'readable-value' => 'integer ' . (int) $value,
+                ];
+
+            case 'double':
+            case 'float':
+                if (!is_numeric($value)) {
+                    throw new \InvalidArgumentException('Non-numeric value specified');
+                }
+                return [
+                    'value' => (double) $value,
+                    'readable-value' => 'double ' . (double) $value,
+                ];
+
+            case 'boolean':
+            case 'bool':
+                $value = strtolower($value);
+                switch ($value) {
+                    case 'true':
+                        return [
+                            'value' => true,
+                            'readable-value' => 'boolean ' . $value,
+                        ];
+
+                    case 'false':
+                        return [
+                            'value' => false,
+                            'readable-value' => 'boolean ' . $value,
+                        ];
+
+                    default:
+                        throw new \InvalidArgumentException('Unable to parse value as boolean');
+                }
+
+                // no break
+            case 'null':
+                return [
+                    'value' => null,
+                    'readable-value' => 'null',
+                ];
+
+            case 'string':
+                $value = (string) $value;
+                return [
+                    'value' => $value,
+                    'readable-value' => ($value === '') ? 'empty string' : 'string ' . $value,
+                ];
+
+            default:
+                throw new \InvalidArgumentException('Invalid type');
+        }
+    }
+
+    /**
+     * @param array $configNames
+     * @param mixed $existingValues
+     * @param mixed $value
+     * @param bool $updateOnly
+     * @return array merged value
+     * @throws \UnexpectedValueException
+     */
+    protected function mergeArrayValue(array $configNames, $existingValues, $value, $updateOnly) {
+        $configName = array_shift($configNames);
+        if (!is_array($existingValues)) {
+            $existingValues = [];
+        }
+        if (!empty($configNames)) {
+            if (isset($existingValues[$configName])) {
+                $existingValue = $existingValues[$configName];
+            } else {
+                $existingValue = [];
+            }
+            $existingValues[$configName] = $this->mergeArrayValue($configNames, $existingValue, $value, $updateOnly);
+        } else {
+            if (!isset($existingValues[$configName]) && $updateOnly) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+            $existingValues[$configName] = $value;
+        }
+        return $existingValues;
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        if ($optionName === 'type') {
+            return ['string', 'integer', 'double', 'boolean'];
+        }
+        return parent::completeOptionValues($optionName, $context);
+    }
 }

core/Command/Config/App/DeleteConfig.php

Indentation +43 added lines, -43 removed lines

@@ -29,53 +29,53 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Base {
-	/** * @var IConfig */
-	protected $config;
+    /** * @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	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) {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
 
-		if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->config->getAppKeys($appName))) {
-			$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->config->getAppKeys($appName))) {
+            $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);
-		$output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
-		return 0;
-	}
+        $this->config->deleteAppValue($appName, $configName);
+        $output->writeln('<info>Config value ' . $configName . ' of app ' . $appName . ' deleted</info>');
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -70,12 +70,12 @@
 		$configName = $input->getArgument('name');
 
 		if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->config->getAppKeys($appName))) {
-			$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->config->deleteAppValue($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/Base.php

Indentation +17 added lines, -17 removed lines

@@ -26,23 +26,23 @@
 
 abstract class Base extends \OC\Core\Command\Base {
 
-	/** * @var IConfig */
-	protected $config;
+    /** * @var IConfig */
+    protected $config;
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			return \OC_App::getAllApps();
-		}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            return \OC_App::getAllApps();
+        }
 
-		if ($argumentName === 'name') {
-			$appName = $context->getWordAtIndex($context->getWordIndex() - 1);
-			return $this->config->getAppKeys($appName);
-		}
-		return [];
-	}
+        if ($argumentName === 'name') {
+            $appName = $context->getWordAtIndex($context->getWordIndex() - 1);
+            return $this->config->getAppKeys($appName);
+        }
+        return [];
+    }
 }

core/Command/Config/App/SetConfig.php

Indentation +50 added lines, -50 removed lines

@@ -29,61 +29,61 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Base {
-	/** * @var IConfig */
-	protected $config;
+    /** * @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    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(
-				'update-only',
-				null,
-				InputOption::VALUE_NONE,
-				'Only updates the value, if it is not set before, it is not being added'
-			)
-		;
-	}
+        $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(
+                '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) {
-		$appName = $input->getArgument('app');
-		$configName = $input->getArgument('name');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
 
-		if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
-			$output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
-			return 1;
-		}
+        if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
+            $output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
+            return 1;
+        }
 
-		$configValue = $input->getOption('value');
-		$this->config->setAppValue($appName, $configName, $configValue);
+        $configValue = $input->getOption('value');
+        $this->config->setAppValue($appName, $configName, $configValue);
 
-		$output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
-		return 0;
-	}
+        $output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
+        return 0;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -76,14 +76,14 @@
 		$configName = $input->getArgument('name');
 
 		if (!in_array($configName, $this->config->getAppKeys($appName)) && $input->hasParameterOption('--update-only')) {
-			$output->writeln('<comment>Config value ' . $configName . ' for app ' . $appName . ' not updated, as it has not been set before.</comment>');
+			$output->writeln('<comment>Config value '.$configName.' for app '.$appName.' not updated, as it has not been set before.</comment>');
 			return 1;
 		}
 
 		$configValue = $input->getOption('value');
 		$this->config->setAppValue($appName, $configName, $configValue);
 
-		$output->writeln('<info>Config value ' . $configName . ' for app ' . $appName . ' set to ' . $configValue . '</info>');
+		$output->writeln('<info>Config value '.$configName.' for app '.$appName.' set to '.$configValue.'</info>');
 		return 0;
 	}
 }

core/Command/Config/App/GetConfig.php

Indentation +54 added lines, -54 removed lines

@@ -29,65 +29,65 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	/** * @var IConfig */
-	protected $config;
+    /** * @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
 
-	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(
-				'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(
+                '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 null|int null or 0 if everything went fine, or an error code
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$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 null|int null or 0 if everything went fine, or an error code
+     */
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $configName = $input->getArgument('name');
+        $defaultValue = $input->getOption('default-value');
 
-		if (!in_array($configName, $this->config->getAppKeys($appName)) && !$input->hasParameterOption('--default-value')) {
-			return 1;
-		}
+        if (!in_array($configName, $this->config->getAppKeys($appName)) && !$input->hasParameterOption('--default-value')) {
+            return 1;
+        }
 
-		if (!in_array($configName, $this->config->getAppKeys($appName))) {
-			$configValue = $defaultValue;
-		} else {
-			$configValue = $this->config->getAppValue($appName, $configName);
-		}
+        if (!in_array($configName, $this->config->getAppKeys($appName))) {
+            $configValue = $defaultValue;
+        } else {
+            $configValue = $this->config->getAppValue($appName, $configName);
+        }
 
-		$this->writeMixedInOutputFormat($input, $output, $configValue);
-		return 0;
-	}
+        $this->writeMixedInOutputFormat($input, $output, $configValue);
+        return 0;
+    }
 }