nextcloud / server

core/Command/Config/System/SetConfig.php

Indentation +177 added lines, -177 removed lines

@@ -33,181 +33,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): int {
-		$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): int {
+        $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/System/GetConfig.php

Indentation +61 added lines, -61 removed lines

@@ -30,72 +30,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): int {
-		$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): int {
+        $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];
-					} elseif (!$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];
+                    } elseif (!$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/System/DeleteConfig.php

Indentation +72 added lines, -72 removed lines

@@ -31,88 +31,88 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig 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:delete')
-			->setDescription('Delete a system config value')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
-				'Name of the config to delete, specify multiple for array parameter'
-			)
-			->addOption(
-				'error-if-not-exists',
-				null,
-				InputOption::VALUE_NONE,
-				'Checks whether the config exists before deleting it'
-			)
-		;
-	}
+        $this
+            ->setName('config:system:delete')
+            ->setDescription('Delete a system config value')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED | InputArgument::IS_ARRAY,
+                'Name of the config to delete, specify multiple for array parameter'
+            )
+            ->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 {
-		$configNames = $input->getArgument('name');
-		$configName = $configNames[0];
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $configNames = $input->getArgument('name');
+        $configName = $configNames[0];
 
-		if (count($configNames) > 1) {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+        if (count($configNames) > 1) {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$value = $this->systemConfig->getValue($configName);
+            $value = $this->systemConfig->getValue($configName);
 
-			try {
-				$value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
-			} catch (\UnexpectedValueException $e) {
-				$output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            try {
+                $value = $this->removeSubValue(array_slice($configNames, 1), $value, $input->hasParameterOption('--error-if-not-exists'));
+            } catch (\UnexpectedValueException $e) {
+                $output->writeln('<error>System config ' . implode(' => ', $configNames) . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->setValue($configName, $value);
-			$output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
-			return 0;
-		} else {
-			if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
-				$output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
-				return 1;
-			}
+            $this->systemConfig->setValue($configName, $value);
+            $output->writeln('<info>System config value ' . implode(' => ', $configNames) . ' deleted</info>');
+            return 0;
+        } else {
+            if ($input->hasParameterOption('--error-if-not-exists') && !in_array($configName, $this->systemConfig->getKeys())) {
+                $output->writeln('<error>System config ' . $configName . ' could not be deleted because it did not exist</error>');
+                return 1;
+            }
 
-			$this->systemConfig->deleteValue($configName);
-			$output->writeln('<info>System config value ' . $configName . ' deleted</info>');
-			return 0;
-		}
-	}
+            $this->systemConfig->deleteValue($configName);
+            $output->writeln('<info>System config value ' . $configName . ' deleted</info>');
+            return 0;
+        }
+    }
 
-	protected function removeSubValue($keys, $currentValue, $throwError) {
-		$nextKey = array_shift($keys);
+    protected function removeSubValue($keys, $currentValue, $throwError) {
+        $nextKey = array_shift($keys);
 
-		if (is_array($currentValue)) {
-			if (isset($currentValue[$nextKey])) {
-				if (empty($keys)) {
-					unset($currentValue[$nextKey]);
-				} else {
-					$currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
-				}
-			} elseif ($throwError) {
-				throw new \UnexpectedValueException('Config parameter does not exist');
-			}
-		} elseif ($throwError) {
-			throw new \UnexpectedValueException('Config parameter does not exist');
-		}
+        if (is_array($currentValue)) {
+            if (isset($currentValue[$nextKey])) {
+                if (empty($keys)) {
+                    unset($currentValue[$nextKey]);
+                } else {
+                    $currentValue[$nextKey] = $this->removeSubValue($keys, $currentValue[$nextKey], $throwError);
+                }
+            } elseif ($throwError) {
+                throw new \UnexpectedValueException('Config parameter does not exist');
+            }
+        } elseif ($throwError) {
+            throw new \UnexpectedValueException('Config parameter does not exist');
+        }
 
-		return $currentValue;
-	}
+        return $currentValue;
+    }
 }

core/Command/Config/Import.php

Indentation +190 added lines, -190 removed lines

@@ -35,194 +35,194 @@
 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): int {
-		$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 1;
-		}
-
-		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>');
-		return 0;
-	}
-
-	/**
-	 * 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): int {
+        $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 1;
+        }
+
+        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>');
+        return 0;
+    }
+
+    /**
+     * 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 [];
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -71,7 +71,7 @@ 
 		try {
 			$configs = $this->validateFileContent($content);
 		} catch (\UnexpectedValueException $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return 1;
 		}
 
@@ -91,7 +91,7 @@ 
 			}
 		}
 
-		$output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>');
+		$output->writeln('<info>Config successfully imported from: '.$importFile.'</info>');
 		return 0;
 	}
 
@@ -145,10 +145,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'])) {
@@ -176,7 +176,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) {
@@ -194,7 +194,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.');
 				}
 			}
 		}

core/Command/Maintenance/Install.php

Indentation +161 added lines, -161 removed lines

@@ -46,165 +46,165 @@
 
 class Install extends Command {
 
-	/**
-	 * @var SystemConfig
-	 */
-	private $config;
-
-	public function __construct(SystemConfig $config) {
-		parent::__construct();
-		$this->config = $config;
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:install')
-			->setDescription('install Nextcloud')
-			->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
-			->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
-			->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
-			->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
-			->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
-			->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
-			->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
-			->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
-			->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
-			->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
-			->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-
-		// validate the environment
-		$server = \OC::$server;
-		$setupHelper = new Setup(
-			$this->config,
-			$server->getIniWrapper(),
-			$server->getL10N('lib'),
-			$server->query(Defaults::class),
-			$server->getLogger(),
-			$server->getSecureRandom(),
-			\OC::$server->query(Installer::class)
-		);
-		$sysInfo = $setupHelper->getSystemInfo(true);
-		$errors = $sysInfo['errors'];
-		if (count($errors) > 0) {
-			$this->printErrors($output, $errors);
-
-			// ignore the OS X setup warning
-			if (count($errors) !== 1 ||
-				(string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
-				return 1;
-			}
-		}
-
-		// validate user input
-		$options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
-
-		// perform installation
-		$errors = $setupHelper->install($options);
-		if (count($errors) > 0) {
-			$this->printErrors($output, $errors);
-			return 1;
-		}
-		$output->writeln("Nextcloud was successfully installed");
-		return 0;
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @param string[] $supportedDatabases
-	 * @return array
-	 */
-	protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
-		$db = strtolower($input->getOption('database'));
-
-		if (!in_array($db, $supportedDatabases)) {
-			throw new InvalidArgumentException("Database <$db> is not supported.");
-		}
-
-		$dbUser = $input->getOption('database-user');
-		$dbPass = $input->getOption('database-pass');
-		$dbName = $input->getOption('database-name');
-		$dbPort = $input->getOption('database-port');
-		if ($db === 'oci') {
-			// an empty hostname needs to be read from the raw parameters
-			$dbHost = $input->getParameterOption('--database-host', '');
-		} else {
-			$dbHost = $input->getOption('database-host');
-		}
-		if ($dbPort) {
-			// Append the port to the host so it is the same as in the config (there is no dbport config)
-			$dbHost .= ':' . $dbPort;
-		}
-		if ($input->hasParameterOption('--database-pass')) {
-			$dbPass = (string) $input->getOption('database-pass');
-		}
-		$adminLogin = $input->getOption('admin-user');
-		$adminPassword = $input->getOption('admin-pass');
-		$adminEmail = $input->getOption('admin-email');
-		$dataDir = $input->getOption('data-dir');
-
-		if ($db !== 'sqlite') {
-			if (is_null($dbUser)) {
-				throw new InvalidArgumentException("Database user not provided.");
-			}
-			if (is_null($dbName)) {
-				throw new InvalidArgumentException("Database name not provided.");
-			}
-			if (is_null($dbPass)) {
-				/** @var QuestionHelper $helper */
-				$helper = $this->getHelper('question');
-				$question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
-				$question->setHidden(true);
-				$question->setHiddenFallback(false);
-				$dbPass = $helper->ask($input, $output, $question);
-			}
-		}
-
-		if (is_null($adminPassword)) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
-			$question->setHidden(true);
-			$question->setHiddenFallback(false);
-			$adminPassword = $helper->ask($input, $output, $question);
-		}
-
-		if ($adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) {
-			throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.');
-		}
-
-		$options = [
-			'dbtype' => $db,
-			'dbuser' => $dbUser,
-			'dbpass' => $dbPass,
-			'dbname' => $dbName,
-			'dbhost' => $dbHost,
-			'adminlogin' => $adminLogin,
-			'adminpass' => $adminPassword,
-			'adminemail' => $adminEmail,
-			'directory' => $dataDir
-		];
-		if ($db === 'oci') {
-			$options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
-		}
-		return $options;
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 * @param $errors
-	 */
-	protected function printErrors(OutputInterface $output, $errors) {
-		foreach ($errors as $error) {
-			if (is_array($error)) {
-				$output->writeln('<error>' . (string)$error['error'] . '</error>');
-				$output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
-			} else {
-				$output->writeln('<error>' . (string)$error . '</error>');
-			}
-		}
-	}
+    /**
+     * @var SystemConfig
+     */
+    private $config;
+
+    public function __construct(SystemConfig $config) {
+        parent::__construct();
+        $this->config = $config;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:install')
+            ->setDescription('install Nextcloud')
+            ->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
+            ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
+            ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
+            ->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
+            ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
+            ->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
+            ->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
+            ->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
+            ->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
+            ->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
+            ->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+
+        // validate the environment
+        $server = \OC::$server;
+        $setupHelper = new Setup(
+            $this->config,
+            $server->getIniWrapper(),
+            $server->getL10N('lib'),
+            $server->query(Defaults::class),
+            $server->getLogger(),
+            $server->getSecureRandom(),
+            \OC::$server->query(Installer::class)
+        );
+        $sysInfo = $setupHelper->getSystemInfo(true);
+        $errors = $sysInfo['errors'];
+        if (count($errors) > 0) {
+            $this->printErrors($output, $errors);
+
+            // ignore the OS X setup warning
+            if (count($errors) !== 1 ||
+                (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
+                return 1;
+            }
+        }
+
+        // validate user input
+        $options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
+
+        // perform installation
+        $errors = $setupHelper->install($options);
+        if (count($errors) > 0) {
+            $this->printErrors($output, $errors);
+            return 1;
+        }
+        $output->writeln("Nextcloud was successfully installed");
+        return 0;
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @param string[] $supportedDatabases
+     * @return array
+     */
+    protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
+        $db = strtolower($input->getOption('database'));
+
+        if (!in_array($db, $supportedDatabases)) {
+            throw new InvalidArgumentException("Database <$db> is not supported.");
+        }
+
+        $dbUser = $input->getOption('database-user');
+        $dbPass = $input->getOption('database-pass');
+        $dbName = $input->getOption('database-name');
+        $dbPort = $input->getOption('database-port');
+        if ($db === 'oci') {
+            // an empty hostname needs to be read from the raw parameters
+            $dbHost = $input->getParameterOption('--database-host', '');
+        } else {
+            $dbHost = $input->getOption('database-host');
+        }
+        if ($dbPort) {
+            // Append the port to the host so it is the same as in the config (there is no dbport config)
+            $dbHost .= ':' . $dbPort;
+        }
+        if ($input->hasParameterOption('--database-pass')) {
+            $dbPass = (string) $input->getOption('database-pass');
+        }
+        $adminLogin = $input->getOption('admin-user');
+        $adminPassword = $input->getOption('admin-pass');
+        $adminEmail = $input->getOption('admin-email');
+        $dataDir = $input->getOption('data-dir');
+
+        if ($db !== 'sqlite') {
+            if (is_null($dbUser)) {
+                throw new InvalidArgumentException("Database user not provided.");
+            }
+            if (is_null($dbName)) {
+                throw new InvalidArgumentException("Database name not provided.");
+            }
+            if (is_null($dbPass)) {
+                /** @var QuestionHelper $helper */
+                $helper = $this->getHelper('question');
+                $question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
+                $question->setHidden(true);
+                $question->setHiddenFallback(false);
+                $dbPass = $helper->ask($input, $output, $question);
+            }
+        }
+
+        if (is_null($adminPassword)) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $adminPassword = $helper->ask($input, $output, $question);
+        }
+
+        if ($adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) {
+            throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.');
+        }
+
+        $options = [
+            'dbtype' => $db,
+            'dbuser' => $dbUser,
+            'dbpass' => $dbPass,
+            'dbname' => $dbName,
+            'dbhost' => $dbHost,
+            'adminlogin' => $adminLogin,
+            'adminpass' => $adminPassword,
+            'adminemail' => $adminEmail,
+            'directory' => $dataDir
+        ];
+        if ($db === 'oci') {
+            $options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
+        }
+        return $options;
+    }
+
+    /**
+     * @param OutputInterface $output
+     * @param $errors
+     */
+    protected function printErrors(OutputInterface $output, $errors) {
+        foreach ($errors as $error) {
+            if (is_array($error)) {
+                $output->writeln('<error>' . (string)$error['error'] . '</error>');
+                $output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
+            } else {
+                $output->writeln('<error>' . (string)$error . '</error>');
+            }
+        }
+    }
 }

core/Command/Maintenance/Mimetype/UpdateDB.php

Indentation +54 added lines, -54 removed lines

@@ -33,68 +33,68 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateDB extends Command {
-	public const DEFAULT_MIMETYPE = 'application/octet-stream';
+    public const DEFAULT_MIMETYPE = 'application/octet-stream';
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
 
-	/** @var IMimeTypeLoader */
-	protected $mimetypeLoader;
+    /** @var IMimeTypeLoader */
+    protected $mimetypeLoader;
 
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector,
-		IMimeTypeLoader $mimetypeLoader
-	) {
-		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
-		$this->mimetypeLoader = $mimetypeLoader;
-	}
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector,
+        IMimeTypeLoader $mimetypeLoader
+    ) {
+        parent::__construct();
+        $this->mimetypeDetector = $mimetypeDetector;
+        $this->mimetypeLoader = $mimetypeLoader;
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:mimetype:update-db')
-			->setDescription('Update database mimetypes and update filecache')
-			->addOption(
-				'repair-filecache',
-				null,
-				InputOption::VALUE_NONE,
-				'Repair filecache for all mimetypes, not just new ones'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:mimetype:update-db')
+            ->setDescription('Update database mimetypes and update filecache')
+            ->addOption(
+                'repair-filecache',
+                null,
+                InputOption::VALUE_NONE,
+                'Repair filecache for all mimetypes, not just new ones'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$mappings = $this->mimetypeDetector->getAllMappings();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $mappings = $this->mimetypeDetector->getAllMappings();
 
-		$totalFilecacheUpdates = 0;
-		$totalNewMimetypes = 0;
+        $totalFilecacheUpdates = 0;
+        $totalNewMimetypes = 0;
 
-		foreach ($mappings as $ext => $mimetypes) {
-			if ($ext[0] === '_') {
-				// comment
-				continue;
-			}
-			$mimetype = $mimetypes[0];
-			$existing = $this->mimetypeLoader->exists($mimetype);
-			// this will add the mimetype if it didn't exist
-			$mimetypeId = $this->mimetypeLoader->getId($mimetype);
+        foreach ($mappings as $ext => $mimetypes) {
+            if ($ext[0] === '_') {
+                // comment
+                continue;
+            }
+            $mimetype = $mimetypes[0];
+            $existing = $this->mimetypeLoader->exists($mimetype);
+            // this will add the mimetype if it didn't exist
+            $mimetypeId = $this->mimetypeLoader->getId($mimetype);
 
-			if (!$existing) {
-				$output->writeln('Added mimetype "'.$mimetype.'" to database');
-				$totalNewMimetypes++;
-			}
+            if (!$existing) {
+                $output->writeln('Added mimetype "'.$mimetype.'" to database');
+                $totalNewMimetypes++;
+            }
 
-			if (!$existing || $input->getOption('repair-filecache')) {
-				$touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
-				if ($touchedFilecacheRows > 0) {
-					$output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
-				}
-				$totalFilecacheUpdates += $touchedFilecacheRows;
-			}
-		}
+            if (!$existing || $input->getOption('repair-filecache')) {
+                $touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
+                if ($touchedFilecacheRows > 0) {
+                    $output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
+                }
+                $totalFilecacheUpdates += $touchedFilecacheRows;
+            }
+        }
 
-		$output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
-		$output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
-		return 0;
-	}
+        $output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
+        $output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
+        return 0;
+    }
 }

core/Command/Maintenance/Mimetype/UpdateJS.php

Indentation +27 added lines, -27 removed lines

@@ -32,31 +32,31 @@
 
 class UpdateJS extends Command {
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
-
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector
-	) {
-		parent::__construct();
-		$this->mimetypeDetector = $mimetypeDetector;
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:mimetype:update-js')
-			->setDescription('Update mimetypelist.js');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		// Fetch all the aliases
-		$aliases = $this->mimetypeDetector->getAllAliases();
-
-		// Output the JS
-		$generatedMimetypeFile = new GenerateMimetypeFileBuilder();
-		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $generatedMimetypeFile->generateFile($aliases));
-
-		$output->writeln('<info>mimetypelist.js is updated');
-		return 0;
-	}
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
+
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector
+    ) {
+        parent::__construct();
+        $this->mimetypeDetector = $mimetypeDetector;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:mimetype:update-js')
+            ->setDescription('Update mimetypelist.js');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        // Fetch all the aliases
+        $aliases = $this->mimetypeDetector->getAllAliases();
+
+        // Output the JS
+        $generatedMimetypeFile = new GenerateMimetypeFileBuilder();
+        file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $generatedMimetypeFile->generateFile($aliases));
+
+        $output->writeln('<info>mimetypelist.js is updated');
+        return 0;
+    }
 }

core/Command/Maintenance/Repair.php

Indentation +106 added lines, -106 removed lines

@@ -41,121 +41,121 @@
 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): int {
-		$repairSteps = $this->repair::getRepairSteps();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $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);
-		return 0;
-	}
+        $this->config->setSystemValue('maintenance', $maintenanceMode);
+        return 0;
+    }
 
-	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;
+        }
+    }
 }

core/Command/Maintenance/UpdateTheme.php

Indentation +25 added lines, -25 removed lines

@@ -34,34 +34,34 @@
 
 class UpdateTheme extends UpdateJS {
 
-	/** @var IMimeTypeDetector */
-	protected $mimetypeDetector;
+    /** @var IMimeTypeDetector */
+    protected $mimetypeDetector;
 
-	/** @var ICacheFactory */
-	protected $cacheFactory;
+    /** @var ICacheFactory */
+    protected $cacheFactory;
 
-	public function __construct(
-		IMimeTypeDetector $mimetypeDetector,
-		ICacheFactory $cacheFactory
-	) {
-		parent::__construct($mimetypeDetector);
-		$this->cacheFactory = $cacheFactory;
-	}
+    public function __construct(
+        IMimeTypeDetector $mimetypeDetector,
+        ICacheFactory $cacheFactory
+    ) {
+        parent::__construct($mimetypeDetector);
+        $this->cacheFactory = $cacheFactory;
+    }
 
-	protected function configure() {
-		$this
-			->setName('maintenance:theme:update')
-			->setDescription('Apply custom theme changes');
-	}
+    protected function configure() {
+        $this
+            ->setName('maintenance:theme:update')
+            ->setDescription('Apply custom theme changes');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		// run mimetypelist.js update since themes might change mimetype icons
-		parent::execute($input, $output);
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        // run mimetypelist.js update since themes might change mimetype icons
+        parent::execute($input, $output);
 
-		// cleanup image cache
-		$c = $this->cacheFactory->createDistributed('imagePath');
-		$c->clear('');
-		$output->writeln('<info>Image cache cleared</info>');
-		return 0;
-	}
+        // cleanup image cache
+        $c = $this->cacheFactory->createDistributed('imagePath');
+        $c->clear('');
+        $output->writeln('<info>Image cache cleared</info>');
+        return 0;
+    }
 }