nextcloud / server

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) {
-
-		// 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) {
+
+        // 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>');
+            }
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -93,7 +93,7 @@ 
 
 			// 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! ') {
+				(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;
 			}
 		}
@@ -136,7 +136,7 @@ 
 		}
 		if ($dbPort) {
 			// Append the port to the host so it is the same as in the config (there is no dbport config)
-			$dbHost .= ':' . $dbPort;
+			$dbHost .= ':'.$dbPort;
 		}
 		if ($input->hasParameterOption('--database-pass')) {
 			$dbPass = (string) $input->getOption('database-pass');
@@ -173,7 +173,7 @@ 
 		}
 
 		if ($adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) {
-			throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.');
+			throw new InvalidArgumentException('Invalid e-mail-address <'.$adminEmail.'> for <'.$adminLogin.'>.');
 		}
 
 		$options = [
@@ -200,10 +200,10 @@ 
 	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>');
+				$output->writeln('<error>'.(string) $error['error'].'</error>');
+				$output->writeln('<info> -> '.(string) $error['hint'].'</info>');
 			} else {
-				$output->writeln('<error>' . (string)$error . '</error>');
+				$output->writeln('<error>'.(string) $error.'</error>');
 			}
 		}
 	}