nextcloud / server

core/Command/Config/System/GetConfig.php

Indentation +61 added lines, -61 removed lines

@@ -29,72 +29,72 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class GetConfig extends Base {
-	/** * @var SystemConfig */
-	protected $systemConfig;
+    /** * @var SystemConfig */
+    protected $systemConfig;
 
-	/**
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		parent::__construct();
-		$this->systemConfig = $systemConfig;
-	}
+    /**
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        parent::__construct();
+        $this->systemConfig = $systemConfig;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('config:system:get')
-			->setDescription('Get a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config to get, specify multiple for array parameter'
-			)
-			->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:system:get')
+            ->setDescription('Get a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config to get, specify multiple for array parameter'
+            )
+            ->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) {
-		$configNames = $input->getArgument('name');
-		$configName = array_shift($configNames);
-		$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) {
+        $configNames = $input->getArgument('name');
+        $configName = array_shift($configNames);
+        $defaultValue = $input->getOption('default-value');
 
-		if (!in_array($configName, $this->systemConfig->getKeys()) && !$input->hasParameterOption('--default-value')) {
-			return 1;
-		}
+        if (!in_array($configName, $this->systemConfig->getKeys()) && !$input->hasParameterOption('--default-value')) {
+            return 1;
+        }
 
-		if (!in_array($configName, $this->systemConfig->getKeys())) {
-			$configValue = $defaultValue;
-		} else {
-			$configValue = $this->systemConfig->getValue($configName);
-			if (!empty($configNames)) {
-				foreach ($configNames as $configName) {
-					if (isset($configValue[$configName])) {
-						$configValue = $configValue[$configName];
-					} else if (!$input->hasParameterOption('--default-value')) {
-						return 1;
-					} else {
-						$configValue = $defaultValue;
-						break;
-					}
-				}
-			}
-		}
+        if (!in_array($configName, $this->systemConfig->getKeys())) {
+            $configValue = $defaultValue;
+        } else {
+            $configValue = $this->systemConfig->getValue($configName);
+            if (!empty($configNames)) {
+                foreach ($configNames as $configName) {
+                    if (isset($configValue[$configName])) {
+                        $configValue = $configValue[$configName];
+                    } else if (!$input->hasParameterOption('--default-value')) {
+                        return 1;
+                    } else {
+                        $configValue = $defaultValue;
+                        break;
+                    }
+                }
+            }
+        }
 
-		$this->writeMixedInOutputFormat($input, $output, $configValue);
-		return 0;
-	}
+        $this->writeMixedInOutputFormat($input, $output, $configValue);
+        return 0;
+    }
 }

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;
+    }
 }

core/Command/Config/Import.php

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class Import extends Command implements CompletionAwareInterface  {
+class Import extends Command implements CompletionAwareInterface {
 	protected $validRootKeys = ['system', 'apps'];
 
 	/** @var IConfig */
@@ -69,7 +69,7 @@ 
 		try {
 			$configs = $this->validateFileContent($content);
 		} catch (\UnexpectedValueException $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return;
 		}
 
@@ -89,7 +89,7 @@ 
 			}
 		}
 
-		$output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>');
+		$output->writeln('<info>Config successfully imported from: '.$importFile.'</info>');
 	}
 
 	/**
@@ -143,10 +143,10 @@ 
 		$additionalKeys = array_diff($arrayKeys, $this->validRootKeys);
 		$commonKeys = array_intersect($arrayKeys, $this->validRootKeys);
 		if (!empty($additionalKeys)) {
-			throw new \UnexpectedValueException('Found invalid entries in root: ' . implode(', ', $additionalKeys));
+			throw new \UnexpectedValueException('Found invalid entries in root: '.implode(', ', $additionalKeys));
 		}
 		if (empty($commonKeys)) {
-			throw new \UnexpectedValueException('At least one key of the following is expected: ' . implode(', ', $this->validRootKeys));
+			throw new \UnexpectedValueException('At least one key of the following is expected: '.implode(', ', $this->validRootKeys));
 		}
 
 		if (isset($array['system'])) {
@@ -174,7 +174,7 @@ 
 	 */
 	protected function checkTypeRecursively($configValue, $configName) {
 		if (!is_array($configValue) && !is_bool($configValue) && !is_int($configValue) && !is_string($configValue) && !is_null($configValue)) {
-			throw new \UnexpectedValueException('Invalid system config value for "' . $configName . '". Only arrays, bools, integers, strings and null (delete) are allowed.');
+			throw new \UnexpectedValueException('Invalid system config value for "'.$configName.'". Only arrays, bools, integers, strings and null (delete) are allowed.');
 		}
 		if (is_array($configValue)) {
 			foreach ($configValue as $key => $value) {
@@ -192,7 +192,7 @@ 
 		foreach ($array as $app => $configs) {
 			foreach ($configs as $name => $value) {
 				if (!is_int($value) && !is_string($value) && !is_null($value)) {
-					throw new \UnexpectedValueException('Invalid app config value for "' . $app . '":"' . $name . '". Only integers, strings and null (delete) are allowed.');
+					throw new \UnexpectedValueException('Invalid app config value for "'.$app.'":"'.$name.'". Only integers, strings and null (delete) are allowed.');
 				}
 			}
 		}

Indentation +189 added lines, -189 removed lines

@@ -33,193 +33,193 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Import extends Command implements CompletionAwareInterface  {
-	protected $validRootKeys = ['system', 'apps'];
-
-	/** @var IConfig */
-	protected $config;
-
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
-
-	protected function configure() {
-		$this
-			->setName('config:import')
-			->setDescription('Import a list of configs')
-			->addArgument(
-				'file',
-				InputArgument::OPTIONAL,
-				'File with the json array to import'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$importFile = $input->getArgument('file');
-		if ($importFile !== null) {
-			$content = $this->getArrayFromFile($importFile);
-		} else {
-			$content = $this->getArrayFromStdin();
-		}
-
-		try {
-			$configs = $this->validateFileContent($content);
-		} catch (\UnexpectedValueException $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
-			return;
-		}
-
-		if (!empty($configs['system'])) {
-			$this->config->setSystemValues($configs['system']);
-		}
-
-		if (!empty($configs['apps'])) {
-			foreach ($configs['apps'] as $app => $appConfigs) {
-				foreach ($appConfigs as $key => $value) {
-					if ($value === null) {
-						$this->config->deleteAppValue($app, $key);
-					} else {
-						$this->config->setAppValue($app, $key, $value);
-					}
-				}
-			}
-		}
-
-		$output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>');
-	}
-
-	/**
-	 * Get the content from stdin ("config:import < file.json")
-	 *
-	 * @return string
-	 */
-	protected function getArrayFromStdin() {
-		// Read from stdin. stream_set_blocking is used to prevent blocking
-		// when nothing is passed via stdin.
-		stream_set_blocking(STDIN, 0);
-		$content = file_get_contents('php://stdin');
-		stream_set_blocking(STDIN, 1);
-		return $content;
-	}
-
-	/**
-	 * Get the content of the specified file ("config:import file.json")
-	 *
-	 * @param string $importFile
-	 * @return string
-	 */
-	protected function getArrayFromFile($importFile) {
-		return file_get_contents($importFile);
-	}
-
-	/**
-	 * @param string $content
-	 * @return array
-	 * @throws \UnexpectedValueException when the array is invalid
-	 */
-	protected function validateFileContent($content) {
-		$decodedContent = json_decode($content, true);
-		if (!is_array($decodedContent) || empty($decodedContent)) {
-			throw new \UnexpectedValueException('The file must contain a valid json array');
-		}
-
-		$this->validateArray($decodedContent);
-
-		return $decodedContent;
-	}
-
-	/**
-	 * Validates that the array only contains `system` and `apps`
-	 *
-	 * @param array $array
-	 */
-	protected function validateArray($array) {
-		$arrayKeys = array_keys($array);
-		$additionalKeys = array_diff($arrayKeys, $this->validRootKeys);
-		$commonKeys = array_intersect($arrayKeys, $this->validRootKeys);
-		if (!empty($additionalKeys)) {
-			throw new \UnexpectedValueException('Found invalid entries in root: ' . implode(', ', $additionalKeys));
-		}
-		if (empty($commonKeys)) {
-			throw new \UnexpectedValueException('At least one key of the following is expected: ' . implode(', ', $this->validRootKeys));
-		}
-
-		if (isset($array['system'])) {
-			if (is_array($array['system'])) {
-				foreach ($array['system'] as $name => $value) {
-					$this->checkTypeRecursively($value, $name);
-				}
-			} else {
-				throw new \UnexpectedValueException('The system config array is not an array');
-			}
-		}
-
-		if (isset($array['apps'])) {
-			if (is_array($array['apps'])) {
-				$this->validateAppsArray($array['apps']);
-			} else {
-				throw new \UnexpectedValueException('The apps config array is not an array');
-			}
-		}
-	}
-
-	/**
-	 * @param mixed $configValue
-	 * @param string $configName
-	 */
-	protected function checkTypeRecursively($configValue, $configName) {
-		if (!is_array($configValue) && !is_bool($configValue) && !is_int($configValue) && !is_string($configValue) && !is_null($configValue)) {
-			throw new \UnexpectedValueException('Invalid system config value for "' . $configName . '". Only arrays, bools, integers, strings and null (delete) are allowed.');
-		}
-		if (is_array($configValue)) {
-			foreach ($configValue as $key => $value) {
-				$this->checkTypeRecursively($value, $configName);
-			}
-		}
-	}
-
-	/**
-	 * Validates that app configs are only integers and strings
-	 *
-	 * @param array $array
-	 */
-	protected function validateAppsArray($array) {
-		foreach ($array as $app => $configs) {
-			foreach ($configs as $name => $value) {
-				if (!is_int($value) && !is_string($value) && !is_null($value)) {
-					throw new \UnexpectedValueException('Invalid app config value for "' . $app . '":"' . $name . '". Only integers, strings and null (delete) are allowed.');
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'file') {
-			$helper = new ShellPathCompletion(
-				$this->getName(),
-				'file',
-				Completion::TYPE_ARGUMENT
-			);
-			return $helper->run();
-		}
-		return [];
-	}
+    protected $validRootKeys = ['system', 'apps'];
+
+    /** @var IConfig */
+    protected $config;
+
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('config:import')
+            ->setDescription('Import a list of configs')
+            ->addArgument(
+                'file',
+                InputArgument::OPTIONAL,
+                'File with the json array to import'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $importFile = $input->getArgument('file');
+        if ($importFile !== null) {
+            $content = $this->getArrayFromFile($importFile);
+        } else {
+            $content = $this->getArrayFromStdin();
+        }
+
+        try {
+            $configs = $this->validateFileContent($content);
+        } catch (\UnexpectedValueException $e) {
+            $output->writeln('<error>' . $e->getMessage(). '</error>');
+            return;
+        }
+
+        if (!empty($configs['system'])) {
+            $this->config->setSystemValues($configs['system']);
+        }
+
+        if (!empty($configs['apps'])) {
+            foreach ($configs['apps'] as $app => $appConfigs) {
+                foreach ($appConfigs as $key => $value) {
+                    if ($value === null) {
+                        $this->config->deleteAppValue($app, $key);
+                    } else {
+                        $this->config->setAppValue($app, $key, $value);
+                    }
+                }
+            }
+        }
+
+        $output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>');
+    }
+
+    /**
+     * Get the content from stdin ("config:import < file.json")
+     *
+     * @return string
+     */
+    protected function getArrayFromStdin() {
+        // Read from stdin. stream_set_blocking is used to prevent blocking
+        // when nothing is passed via stdin.
+        stream_set_blocking(STDIN, 0);
+        $content = file_get_contents('php://stdin');
+        stream_set_blocking(STDIN, 1);
+        return $content;
+    }
+
+    /**
+     * Get the content of the specified file ("config:import file.json")
+     *
+     * @param string $importFile
+     * @return string
+     */
+    protected function getArrayFromFile($importFile) {
+        return file_get_contents($importFile);
+    }
+
+    /**
+     * @param string $content
+     * @return array
+     * @throws \UnexpectedValueException when the array is invalid
+     */
+    protected function validateFileContent($content) {
+        $decodedContent = json_decode($content, true);
+        if (!is_array($decodedContent) || empty($decodedContent)) {
+            throw new \UnexpectedValueException('The file must contain a valid json array');
+        }
+
+        $this->validateArray($decodedContent);
+
+        return $decodedContent;
+    }
+
+    /**
+     * Validates that the array only contains `system` and `apps`
+     *
+     * @param array $array
+     */
+    protected function validateArray($array) {
+        $arrayKeys = array_keys($array);
+        $additionalKeys = array_diff($arrayKeys, $this->validRootKeys);
+        $commonKeys = array_intersect($arrayKeys, $this->validRootKeys);
+        if (!empty($additionalKeys)) {
+            throw new \UnexpectedValueException('Found invalid entries in root: ' . implode(', ', $additionalKeys));
+        }
+        if (empty($commonKeys)) {
+            throw new \UnexpectedValueException('At least one key of the following is expected: ' . implode(', ', $this->validRootKeys));
+        }
+
+        if (isset($array['system'])) {
+            if (is_array($array['system'])) {
+                foreach ($array['system'] as $name => $value) {
+                    $this->checkTypeRecursively($value, $name);
+                }
+            } else {
+                throw new \UnexpectedValueException('The system config array is not an array');
+            }
+        }
+
+        if (isset($array['apps'])) {
+            if (is_array($array['apps'])) {
+                $this->validateAppsArray($array['apps']);
+            } else {
+                throw new \UnexpectedValueException('The apps config array is not an array');
+            }
+        }
+    }
+
+    /**
+     * @param mixed $configValue
+     * @param string $configName
+     */
+    protected function checkTypeRecursively($configValue, $configName) {
+        if (!is_array($configValue) && !is_bool($configValue) && !is_int($configValue) && !is_string($configValue) && !is_null($configValue)) {
+            throw new \UnexpectedValueException('Invalid system config value for "' . $configName . '". Only arrays, bools, integers, strings and null (delete) are allowed.');
+        }
+        if (is_array($configValue)) {
+            foreach ($configValue as $key => $value) {
+                $this->checkTypeRecursively($value, $configName);
+            }
+        }
+    }
+
+    /**
+     * Validates that app configs are only integers and strings
+     *
+     * @param array $array
+     */
+    protected function validateAppsArray($array) {
+        foreach ($array as $app => $configs) {
+            foreach ($configs as $name => $value) {
+                if (!is_int($value) && !is_string($value) && !is_null($value)) {
+                    throw new \UnexpectedValueException('Invalid app config value for "' . $app . '":"' . $name . '". Only integers, strings and null (delete) are allowed.');
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'file') {
+            $helper = new ShellPathCompletion(
+                $this->getName(),
+                'file',
+                Completion::TYPE_ARGUMENT
+            );
+            return $helper->run();
+        }
+        return [];
+    }
 }

core/Command/Status.php

Indentation +16 added lines, -16 removed lines

@@ -28,23 +28,23 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Status extends Base {
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('status')
-			->setDescription('show some status information')
-		;
-	}
+        $this
+            ->setName('status')
+            ->setDescription('show some status information')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$values = array(
-			'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
-			'version' => implode('.', \OCP\Util::getVersion()),
-			'versionstring' => \OC_Util::getVersionString(),
-			'edition' => '',
-		);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $values = array(
+            'installed' => (bool) \OC::$server->getConfig()->getSystemValue('installed', false),
+            'version' => implode('.', \OCP\Util::getVersion()),
+            'versionstring' => \OC_Util::getVersionString(),
+            'edition' => '',
+        );
 
-		$this->writeArrayInOutputFormat($input, $output, $values);
-	}
+        $this->writeArrayInOutputFormat($input, $output, $values);
+    }
 }

core/Command/Maintenance/DataFingerprint.php

Indentation +18 added lines, -18 removed lines

@@ -30,25 +30,25 @@
 
 class DataFingerprint extends Command {
 
-	/** @var IConfig */
-	protected $config;
-	/** @var ITimeFactory */
-	protected $timeFactory;
+    /** @var IConfig */
+    protected $config;
+    /** @var ITimeFactory */
+    protected $timeFactory;
 
-	public function __construct(IConfig $config,
-								ITimeFactory $timeFactory) {
-		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		parent::__construct();
-	}
+    public function __construct(IConfig $config,
+                                ITimeFactory $timeFactory) {
+        $this->config = $config;
+        $this->timeFactory = $timeFactory;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:data-fingerprint')
-			->setDescription('update the systems data-fingerprint after a backup is restored');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:data-fingerprint')
+            ->setDescription('update the systems data-fingerprint after a backup is restored');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $this->config->setSystemValue('data-fingerprint', md5($this->timeFactory->getTime()));
+    }
 }

core/Command/Maintenance/Repair.php

Spacing +4 added lines, -4 removed lines

@@ -132,16 +132,16 @@
 				$this->output->writeln('');
 				break;
 			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
+				$this->output->writeln(' - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
+				$this->output->writeln('     - '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+				$this->output->writeln('     - WARNING: '.$event->getArgument(0));
 				break;
 			case '\OC\Repair::error':
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
+				$this->output->writeln('     - ERROR: '.$event->getArgument(0));
 				break;
 		}
 	}

Indentation +105 added lines, -105 removed lines

@@ -38,120 +38,120 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair extends Command {
-	/** @var \OC\Repair $repair */
-	protected $repair;
-	/** @var IConfig */
-	protected $config;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var ProgressBar */
-	private $progress;
-	/** @var OutputInterface */
-	private $output;
-	/** @var IAppManager */
-	private $appManager;
+    /** @var \OC\Repair $repair */
+    protected $repair;
+    /** @var IConfig */
+    protected $config;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var ProgressBar */
+    private $progress;
+    /** @var OutputInterface */
+    private $output;
+    /** @var IAppManager */
+    private $appManager;
 
-	/**
-	 * @param \OC\Repair $repair
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
-		$this->repair = $repair;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-		$this->appManager = $appManager;
-		parent::__construct();
-	}
+    /**
+     * @param \OC\Repair $repair
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     * @param IAppManager $appManager
+     */
+    public function __construct(\OC\Repair $repair, IConfig $config, EventDispatcherInterface $dispatcher, IAppManager $appManager) {
+        $this->repair = $repair;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+        $this->appManager = $appManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:repair')
-			->setDescription('repair this installation')
-			->addOption(
-				'include-expensive',
-				null,
-				InputOption::VALUE_NONE,
-				'Use this option when you want to include resource and load expensive tasks');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:repair')
+            ->setDescription('repair this installation')
+            ->addOption(
+                'include-expensive',
+                null,
+                InputOption::VALUE_NONE,
+                'Use this option when you want to include resource and load expensive tasks');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$repairSteps = $this->repair::getRepairSteps();
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $repairSteps = $this->repair::getRepairSteps();
 
-		if ($input->getOption('include-expensive')) {
-			$repairSteps = array_merge($repairSteps, $this->repair::getExpensiveRepairSteps());
-		}
+        if ($input->getOption('include-expensive')) {
+            $repairSteps = array_merge($repairSteps, $this->repair::getExpensiveRepairSteps());
+        }
 
-		foreach ($repairSteps as $step) {
-			$this->repair->addStep($step);
-		}
+        foreach ($repairSteps as $step) {
+            $this->repair->addStep($step);
+        }
 
-		$apps = $this->appManager->getInstalledApps();
-		foreach ($apps as $app) {
-			if (!$this->appManager->isEnabledForUser($app)) {
-				continue;
-			}
-			$info = \OC_App::getAppInfo($app);
-			if (!is_array($info)) {
-				continue;
-			}
-			\OC_App::loadApp($app);
-			$steps = $info['repair-steps']['post-migration'];
-			foreach ($steps as $step) {
-				try {
-					$this->repair->addStep($step);
-				} catch (Exception $ex) {
-					$output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
-				}
-			}
-		}
+        $apps = $this->appManager->getInstalledApps();
+        foreach ($apps as $app) {
+            if (!$this->appManager->isEnabledForUser($app)) {
+                continue;
+            }
+            $info = \OC_App::getAppInfo($app);
+            if (!is_array($info)) {
+                continue;
+            }
+            \OC_App::loadApp($app);
+            $steps = $info['repair-steps']['post-migration'];
+            foreach ($steps as $step) {
+                try {
+                    $this->repair->addStep($step);
+                } catch (Exception $ex) {
+                    $output->writeln("<error>Failed to load repair step for $app: {$ex->getMessage()}</error>");
+                }
+            }
+        }
 
-		$maintenanceMode = $this->config->getSystemValueBool('maintenance');
-		$this->config->setSystemValue('maintenance', true);
+        $maintenanceMode = $this->config->getSystemValueBool('maintenance');
+        $this->config->setSystemValue('maintenance', true);
 
-		$this->progress = new ProgressBar($output);
-		$this->output = $output;
-		$this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
-		$this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
+        $this->progress = new ProgressBar($output);
+        $this->output = $output;
+        $this->dispatcher->addListener('\OC\Repair::startProgress', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::advance', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::finishProgress', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::step', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::info', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::warning', [$this, 'handleRepairFeedBack']);
+        $this->dispatcher->addListener('\OC\Repair::error', [$this, 'handleRepairFeedBack']);
 
-		$this->repair->run();
+        $this->repair->run();
 
-		$this->config->setSystemValue('maintenance', $maintenanceMode);
-	}
+        $this->config->setSystemValue('maintenance', $maintenanceMode);
+    }
 
-	public function handleRepairFeedBack($event) {
-		if (!$event instanceof GenericEvent) {
-			return;
-		}
-		switch ($event->getSubject()) {
-			case '\OC\Repair::startProgress':
-				$this->progress->start($event->getArgument(0));
-				break;
-			case '\OC\Repair::advance':
-				$this->progress->advance($event->getArgument(0));
-				break;
-			case '\OC\Repair::finishProgress':
-				$this->progress->finish();
-				$this->output->writeln('');
-				break;
-			case '\OC\Repair::step':
-				$this->output->writeln(' - ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::info':
-				$this->output->writeln('     - ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::warning':
-				$this->output->writeln('     - WARNING: ' . $event->getArgument(0));
-				break;
-			case '\OC\Repair::error':
-				$this->output->writeln('     - ERROR: ' . $event->getArgument(0));
-				break;
-		}
-	}
+    public function handleRepairFeedBack($event) {
+        if (!$event instanceof GenericEvent) {
+            return;
+        }
+        switch ($event->getSubject()) {
+            case '\OC\Repair::startProgress':
+                $this->progress->start($event->getArgument(0));
+                break;
+            case '\OC\Repair::advance':
+                $this->progress->advance($event->getArgument(0));
+                break;
+            case '\OC\Repair::finishProgress':
+                $this->progress->finish();
+                $this->output->writeln('');
+                break;
+            case '\OC\Repair::step':
+                $this->output->writeln(' - ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::info':
+                $this->output->writeln('     - ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::warning':
+                $this->output->writeln('     - WARNING: ' . $event->getArgument(0));
+                break;
+            case '\OC\Repair::error':
+                $this->output->writeln('     - ERROR: ' . $event->getArgument(0));
+                break;
+        }
+    }
 }