nextcloud / server

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/TwoFactorAuth/Enable.php

Indentation +25 added lines, -25 removed lines

@@ -30,35 +30,35 @@
 
 class Enable extends Base {
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	public function __construct(Manager $manager, IUserManager $userManager) {
-		parent::__construct('twofactorauth:enable');
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    public function __construct(Manager $manager, IUserManager $userManager) {
+        parent::__construct('twofactorauth:enable');
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('twofactorauth:enable');
-		$this->setDescription('Enable two-factor authentication for a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
+        $this->setName('twofactorauth:enable');
+        $this->setDescription('Enable two-factor authentication for a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return;
-		}
-		$this->manager->enableTwoFactorAuthentication($user);
-		$output->writeln("Two-factor authentication enabled for user $uid");
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return;
+        }
+        $this->manager->enableTwoFactorAuthentication($user);
+        $output->writeln("Two-factor authentication enabled for user $uid");
+    }
 
 }

core/Command/TwoFactorAuth/Disable.php

Indentation +25 added lines, -25 removed lines

@@ -30,35 +30,35 @@
 
 class Disable extends Base {
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	public function __construct(Manager $manager, IUserManager $userManager) {
-		parent::__construct('twofactorauth:disable');
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    public function __construct(Manager $manager, IUserManager $userManager) {
+        parent::__construct('twofactorauth:disable');
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('twofactorauth:disable');
-		$this->setDescription('Disable two-factor authentication for a user');
-		$this->addArgument('uid', InputArgument::REQUIRED);
-	}
+        $this->setName('twofactorauth:disable');
+        $this->setDescription('Disable two-factor authentication for a user');
+        $this->addArgument('uid', InputArgument::REQUIRED);
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$uid = $input->getArgument('uid');
-		$user = $this->userManager->get($uid);
-		if (is_null($user)) {
-			$output->writeln("<error>Invalid UID</error>");
-			return;
-		}
-		$this->manager->disableTwoFactorAuthentication($user);
-		$output->writeln("Two-factor authentication disabled for user $uid");
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $uid = $input->getArgument('uid');
+        $user = $this->userManager->get($uid);
+        if (is_null($user)) {
+            $output->writeln("<error>Invalid UID</error>");
+            return;
+        }
+        $this->manager->disableTwoFactorAuthentication($user);
+        $output->writeln("Two-factor authentication disabled for user $uid");
+    }
 
 }

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 +103 added lines, -103 removed lines

@@ -38,116 +38,116 @@
 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) {
-		$includeExpensive = $input->getOption('include-expensive');
-		if ($includeExpensive) {
-			foreach ($this->repair->getExpensiveRepairSteps() as $step) {
-				$this->repair->addStep($step);
-			}
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $includeExpensive = $input->getOption('include-expensive');
+        if ($includeExpensive) {
+            foreach ($this->repair->getExpensiveRepairSteps() 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;
-			}
-			$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;
+            }
+            $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->getSystemValue('maintenance', false);
-		$this->config->setSystemValue('maintenance', true);
+        $maintenanceMode = $this->config->getSystemValue('maintenance', false);
+        $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;
+        }
+    }
 }

core/Command/Maintenance/Mimetype/UpdateDB.php

Indentation +53 added lines, -53 removed lines

@@ -32,67 +32,67 @@
 
 class UpdateDB extends Command {
 
-	const DEFAULT_MIMETYPE = 'application/octet-stream';
+    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) {
-		$mappings = $this->mimetypeDetector->getAllMappings();
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $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');
-	}
+        $output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
+        $output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
+    }
 }

core/Command/Maintenance/Mimetype/UpdateJS.php

Indentation +80 added lines, -80 removed lines

@@ -32,82 +32,82 @@ 
 
 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) {
-		// Fetch all the aliases
-		$aliases = $this->mimetypeDetector->getAllAliases();
-
-		// Remove comments
-		$keys = array_filter(array_keys($aliases), function($k) {
-			return $k[0] === '_';
-		});
-		foreach($keys as $key) {
-			unset($aliases[$key]);
-		}
-
-		// Fetch all files
-		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
-
-		$files = [];
-		foreach($dir as $fileInfo) {
-			if ($fileInfo->isFile()) {
-				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-				$files[] = $file;
-			}
-		}
-
-		//Remove duplicates
-		$files = array_values(array_unique($files));
-		sort($files);
-
-		// Fetch all themes!
-		$themes = [];
-		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
-			//Valid theme dir
-			if ($dir->isFile() || $dir->isDot()) {
-				continue;
-			}
-
-			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
-			// Check if this theme has its own filetype icons
-			if (!file_exists($themeDir)) {
-				continue;
-			}
-
-			$themes[$theme] = [];
-			// Fetch all the theme icons!
-			$themeIt = new \DirectoryIterator($themeDir);
-			foreach ($themeIt as $fileInfo) {
-				if ($fileInfo->isFile()) {
-					$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-					$themes[$theme][] = $file;
-				}
-			}
-
-			//Remove Duplicates
-			$themes[$theme] = array_values(array_unique($themes[$theme]));
-			sort($themes[$theme]);
-		}
-
-		//Generate the JS
-		$js = '/**
+    /** @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) {
+        // Fetch all the aliases
+        $aliases = $this->mimetypeDetector->getAllAliases();
+
+        // Remove comments
+        $keys = array_filter(array_keys($aliases), function($k) {
+            return $k[0] === '_';
+        });
+        foreach($keys as $key) {
+            unset($aliases[$key]);
+        }
+
+        // Fetch all files
+        $dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
+
+        $files = [];
+        foreach($dir as $fileInfo) {
+            if ($fileInfo->isFile()) {
+                $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                $files[] = $file;
+            }
+        }
+
+        //Remove duplicates
+        $files = array_values(array_unique($files));
+        sort($files);
+
+        // Fetch all themes!
+        $themes = [];
+        $dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
+        foreach($dirs as $dir) {
+            //Valid theme dir
+            if ($dir->isFile() || $dir->isDot()) {
+                continue;
+            }
+
+            $theme = $dir->getFilename();
+            $themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+            // Check if this theme has its own filetype icons
+            if (!file_exists($themeDir)) {
+                continue;
+            }
+
+            $themes[$theme] = [];
+            // Fetch all the theme icons!
+            $themeIt = new \DirectoryIterator($themeDir);
+            foreach ($themeIt as $fileInfo) {
+                if ($fileInfo->isFile()) {
+                    $file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+                    $themes[$theme][] = $file;
+                }
+            }
+
+            //Remove Duplicates
+            $themes[$theme] = array_values(array_unique($themes[$theme]));
+            sort($themes[$theme]);
+        }
+
+        //Generate the JS
+        $js = '/**
 * This file is automatically generated
 * DO NOT EDIT MANUALLY!
 *
@@ -122,9 +122,9 @@ 
 };
 ';
 
-		//Output the JS
-		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
+        //Output the JS
+        file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
 
-		$output->writeln('<info>mimetypelist.js is updated');
-	}
+        $output->writeln('<info>mimetypelist.js is updated');
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
 		$keys = array_filter(array_keys($aliases), function($k) {
 			return $k[0] === '_';
 		});
-		foreach($keys as $key) {
+		foreach ($keys as $key) {
 			unset($aliases[$key]);
 		}
 
@@ -64,7 +64,7 @@ 
 		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
-		foreach($dir as $fileInfo) {
+		foreach ($dir as $fileInfo) {
 			if ($fileInfo->isFile()) {
 				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
 				$files[] = $file;
@@ -78,14 +78,14 @@ 
 		// Fetch all themes!
 		$themes = [];
 		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
-		foreach($dirs as $dir) {
+		foreach ($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
 				continue;
 			}
 
 			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
 			// Check if this theme has its own filetype icons
 			if (!file_exists($themeDir)) {
 				continue;
@@ -116,9 +116,9 @@ 
 * To regenerate this file run ./occ maintenance:mimetype:update-js
 */
 OC.MimeTypeList={
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
 };
 ';