nextcloud / server

apps/provisioning_api/lib/Middleware/Exceptions/NotSubAdminException.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@
 use OCP\AppFramework\Http;
 
 class NotSubAdminException extends \Exception {
-	public function __construct() {
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
-	}
+    public function __construct() {
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
+    }
 }

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 = [
-			'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 = [
+            '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);
+    }
 }

lib/private/L10N/L10NString.php

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
 				$text = $translations[$this->text][$id];
-			}
-			else{
+			} else{
 				$text = $translations[$this->text];
 			}
 		}

Indentation +46 added lines, -46 removed lines

@@ -29,59 +29,59 @@
 namespace OC\L10N;
 
 class L10NString implements \JsonSerializable {
-	/** @var \OC\L10N\L10N */
-	protected $l10n;
+    /** @var \OC\L10N\L10N */
+    protected $l10n;
 
-	/** @var string */
-	protected $text;
+    /** @var string */
+    protected $text;
 
-	/** @var array */
-	protected $parameters;
+    /** @var array */
+    protected $parameters;
 
-	/** @var integer */
-	protected $count;
+    /** @var integer */
+    protected $count;
 
-	/**
-	 * @param \OC\L10N\L10N $l10n
-	 * @param string|string[] $text
-	 * @param array $parameters
-	 * @param int $count
-	 */
-	public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) {
-		$this->l10n = $l10n;
-		$this->text = $text;
-		$this->parameters = $parameters;
-		$this->count = $count;
-	}
+    /**
+     * @param \OC\L10N\L10N $l10n
+     * @param string|string[] $text
+     * @param array $parameters
+     * @param int $count
+     */
+    public function __construct(\OC\L10N\L10N $l10n, $text, $parameters, $count = 1) {
+        $this->l10n = $l10n;
+        $this->text = $text;
+        $this->parameters = $parameters;
+        $this->count = $count;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		$translations = $this->l10n->getTranslations();
+    /**
+     * @return string
+     */
+    public function __toString() {
+        $translations = $this->l10n->getTranslations();
 
-		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
-				$fn = $this->l10n->getPluralFormFunction();
-				$id = $fn($this->count);
-				$text = $translations[$this->text][$id];
-			}
-			else{
-				$text = $translations[$this->text];
-			}
-		}
+        $text = $this->text;
+        if(array_key_exists($this->text, $translations)) {
+            if(is_array($translations[$this->text])) {
+                $fn = $this->l10n->getPluralFormFunction();
+                $id = $fn($this->count);
+                $text = $translations[$this->text][$id];
+            }
+            else{
+                $text = $translations[$this->text];
+            }
+        }
 
-		// Replace %n first (won't interfere with vsprintf)
-		$text = str_replace('%n', (string)$this->count, $text);
-		return vsprintf($text, $this->parameters);
-	}
+        // Replace %n first (won't interfere with vsprintf)
+        $text = str_replace('%n', (string)$this->count, $text);
+        return vsprintf($text, $this->parameters);
+    }
 
 
-	/**
-	 * @return string
-	 */
-	public function jsonSerialize() {
-		return $this->__toString();
-	}
+    /**
+     * @return string
+     */
+    public function jsonSerialize() {
+        return $this->__toString();
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -56,19 +56,19 @@
 		$translations = $this->l10n->getTranslations();
 
 		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
+		if (array_key_exists($this->text, $translations)) {
+			if (is_array($translations[$this->text])) {
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
 				$text = $translations[$this->text][$id];
 			}
-			else{
+			else {
 				$text = $translations[$this->text];
 			}
 		}
 
 		// Replace %n first (won't interfere with vsprintf)
-		$text = str_replace('%n', (string)$this->count, $text);
+		$text = str_replace('%n', (string) $this->count, $text);
 		return vsprintf($text, $this->parameters);
 	}
 

lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -147,7 +147,7 @@ 
 	public function castColumn($column, $type) {
 		if ($type === IQueryBuilder::PARAM_STR) {
 			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
+			return new QueryFunction('to_char('.$column.')');
 		}
 
 		return parent::castColumn($column, $type);
@@ -157,7 +157,7 @@ 
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 
 	/**
@@ -166,6 +166,6 @@ 
 	public function iLike($x, $y, $type = null) {
 		$x = $this->helper->quoteColumnName($x);
 		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
+		return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE(REPLACE('.$y.', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
 	}
 }

Indentation +157 added lines, -157 removed lines

@@ -33,161 +33,161 @@
 
 class OCIExpressionBuilder extends ExpressionBuilder {
 
-	/**
-	 * @param mixed $column
-	 * @param mixed|null $type
-	 * @return array|IQueryFunction|string
-	 */
-	protected function prepareColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
-			$column = $this->castColumn($column, $type);
-		} else {
-			$column = $this->helper->quoteColumnNames($column);
-		}
-		return $column;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function comparison($x, $operator, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->comparison($x, $operator, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function eq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->eq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function neq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->neq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function in($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->in($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function notIn($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->notIn($x, $y);
-	}
-
-	/**
-	 * Creates a $x = '' statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function emptyString($x) {
-		return $this->isNull($x);
-	}
-
-	/**
-	 * Creates a `$x <> ''` statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function nonEmptyString($x) {
-		return $this->isNotNull($x);
-	}
-
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return IQueryFunction
-	 */
-	public function castColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR) {
-			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
-		}
-
-		return parent::castColumn($column, $type);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
-	}
+    /**
+     * @param mixed $column
+     * @param mixed|null $type
+     * @return array|IQueryFunction|string
+     */
+    protected function prepareColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
+            $column = $this->castColumn($column, $type);
+        } else {
+            $column = $this->helper->quoteColumnNames($column);
+        }
+        return $column;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function comparison($x, $operator, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->comparison($x, $operator, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function eq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->eq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function neq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->neq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function in($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->in($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function notIn($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->notIn($x, $y);
+    }
+
+    /**
+     * Creates a $x = '' statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function emptyString($x) {
+        return $this->isNull($x);
+    }
+
+    /**
+     * Creates a `$x <> ''` statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function nonEmptyString($x) {
+        return $this->isNotNull($x);
+    }
+
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return IQueryFunction
+     */
+    public function castColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR) {
+            $column = $this->helper->quoteColumnName($column);
+            return new QueryFunction('to_char(' . $column . ')');
+        }
+
+        return parent::castColumn($column, $type);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function like($x, $y, $type = null) {
+        return parent::like($x, $y, $type) . " ESCAPE '\\'";
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
+    }
 }

core/Command/Db/ConvertType.php

Spacing +8 added lines, -8 removed lines

@@ -233,7 +233,7 @@ 
 
 		$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
 		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
 				$schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
 			} else {
@@ -269,13 +269,13 @@ 
 		if (!empty($toTables)) {
 			$output->writeln('<info>Clearing schema in new database</info>');
 		}
-		foreach($toTables as $table) {
+		foreach ($toTables as $table) {
 			$db->getSchemaManager()->dropTable($table);
 		}
 	}
 
 	protected function getTables(Connection $db) {
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+		$filterExpression = '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 		$db->getConfiguration()->
 			setFilterSchemaAssetsExpression($filterExpression);
 		return $db->getSchemaManager()->listTableNames();
@@ -290,7 +290,7 @@ 
 	 * @suppress SqlInjectionChecker
 	 */
 	protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
-		if ($table->getName() === $toDB->getPrefix() . 'migrations') {
+		if ($table->getName() === $toDB->getPrefix().'migrations') {
 			$output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
 			return;
 		}
@@ -305,9 +305,9 @@ 
 		$count = $result->fetchColumn();
 		$result->closeCursor();
 
-		$numChunks = ceil($count/$chunkSize);
+		$numChunks = ceil($count / $chunkSize);
 		if ($numChunks > 1) {
-			$output->writeln('chunked query, ' . $numChunks . ' chunks');
+			$output->writeln('chunked query, '.$numChunks.' chunks');
 		}
 
 		$progress = new ProgressBar($output, $count);
@@ -394,7 +394,7 @@ 
 
 		try {
 			// copy table rows
-			foreach($tables as $table) {
+			foreach ($tables as $table) {
 				$output->writeln($table);
 				$this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
 			}
@@ -404,7 +404,7 @@ 
 			}
 			// save new database config
 			$this->saveDBInfo($input);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->config->setSystemValue('maintenance', false);
 			throw $e;
 		}

Indentation +410 added lines, -410 removed lines

@@ -52,414 +52,414 @@
 use Symfony\Component\Console\Question\Question;
 
 class ConvertType extends Command implements CompletionAwareInterface {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var \OC\DB\ConnectionFactory
-	 */
-	protected $connectionFactory;
-
-	/** @var array */
-	protected $columnTypes;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OC\DB\ConnectionFactory $connectionFactory
-	 */
-	public function __construct(IConfig $config, ConnectionFactory $connectionFactory) {
-		$this->config = $config;
-		$this->connectionFactory = $connectionFactory;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:convert-type')
-			->setDescription('Convert the Nextcloud database to the newly configured one')
-			->addArgument(
-				'type',
-				InputArgument::REQUIRED,
-				'the type of the database to convert to'
-			)
-			->addArgument(
-				'username',
-				InputArgument::REQUIRED,
-				'the username of the database to convert to'
-			)
-			->addArgument(
-				'hostname',
-				InputArgument::REQUIRED,
-				'the hostname of the database to convert to'
-			)
-			->addArgument(
-				'database',
-				InputArgument::REQUIRED,
-				'the name of the database to convert to'
-			)
-			->addOption(
-				'port',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the port of the database to convert to'
-			)
-			->addOption(
-				'password',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
-			)
-			->addOption(
-				'clear-schema',
-				null,
-				InputOption::VALUE_NONE,
-				'remove all tables from the destination database'
-			)
-			->addOption(
-				'all-apps',
-				null,
-				InputOption::VALUE_NONE,
-				'whether to create schema for all apps instead of only installed apps'
-			)
-			->addOption(
-				'chunk-size',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the maximum number of database rows to handle in a single query, bigger tables will be handled in chunks of this size. Lower this if the process runs out of memory during conversion.',
-				1000
-			)
-		;
-	}
-
-	protected function validateInput(InputInterface $input, OutputInterface $output) {
-		$type = $this->connectionFactory->normalizeType($input->getArgument('type'));
-		if ($type === 'sqlite3') {
-			throw new \InvalidArgumentException(
-				'Converting to SQLite (sqlite3) is currently not supported.'
-			);
-		}
-		if ($type === $this->config->getSystemValue('dbtype', '')) {
-			throw new \InvalidArgumentException(sprintf(
-				'Can not convert from %1$s to %1$s.',
-				$type
-			));
-		}
-		if ($type === 'oci' && $input->getOption('clear-schema')) {
-			// Doctrine unconditionally tries (at least in version 2.3)
-			// to drop sequence triggers when dropping a table, even though
-			// such triggers may not exist. This results in errors like
-			// "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
-			throw new \InvalidArgumentException(
-				'The --clear-schema option is not supported when converting to Oracle (oci).'
-			);
-		}
-	}
-
-	protected function readPassword(InputInterface $input, OutputInterface $output) {
-		// Explicitly specified password
-		if ($input->getOption('password')) {
-			return;
-		}
-
-		// Read from stdin. stream_set_blocking is used to prevent blocking
-		// when nothing is passed via stdin.
-		stream_set_blocking(STDIN, 0);
-		$password = file_get_contents('php://stdin');
-		stream_set_blocking(STDIN, 1);
-		if (trim($password) !== '') {
-			$input->setOption('password', $password);
-			return;
-		}
-
-		// Read password by interacting
-		if ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new Question('What is the database password?');
-			$question->setHidden(true);
-			$question->setHiddenFallback(false);
-			$password = $helper->ask($input, $output, $question);
-			$input->setOption('password', $password);
-			return;
-		}
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$this->validateInput($input, $output);
-		$this->readPassword($input, $output);
-
-		$fromDB = \OC::$server->getDatabaseConnection();
-		$toDB = $this->getToDBConnection($input, $output);
-
-		if ($input->getOption('clear-schema')) {
-			$this->clearSchema($toDB, $input, $output);
-		}
-
-		$this->createSchema($fromDB, $toDB, $input, $output);
-
-		$toTables = $this->getTables($toDB);
-		$fromTables = $this->getTables($fromDB);
-
-		// warn/fail if there are more tables in 'from' database
-		$extraFromTables = array_diff($fromTables, $toTables);
-		if (!empty($extraFromTables)) {
-			$output->writeln('<comment>The following tables will not be converted:</comment>');
-			$output->writeln($extraFromTables);
-			if (!$input->getOption('all-apps')) {
-				$output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
-				$output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
-			}
-
-			$continueConversion = !$input->isInteractive(); // assume yes for --no-interaction and no otherwise.
-			$question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', $continueConversion);
-
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (!$helper->ask($input, $output, $question)) {
-				return;
-			}
-		}
-		$intersectingTables = array_intersect($toTables, $fromTables);
-		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
-	}
-
-	protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) {
-		$output->writeln('<info>Creating schema in new database</info>');
-
-		$fromMS = new MigrationService('core', $fromDB);
-		$currentMigration = $fromMS->getMigration('current');
-		if ($currentMigration !== '0') {
-			$toMS = new MigrationService('core', $toDB);
-			$toMS->migrate($currentMigration);
-		}
-
-		$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
-		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
-		foreach($apps as $app) {
-			if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
-				$schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
-			} else {
-				// Make sure autoloading works...
-				\OC_App::loadApp($app);
-				$fromMS = new MigrationService($app, $fromDB);
-				$currentMigration = $fromMS->getMigration('current');
-				if ($currentMigration !== '0') {
-					$toMS = new MigrationService($app, $toDB);
-					$toMS->migrate($currentMigration, true);
-				}
-			}
-		}
-	}
-
-	protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
-		$type = $input->getArgument('type');
-		$connectionParams = $this->connectionFactory->createConnectionParams();
-		$connectionParams = array_merge($connectionParams, [
-			'host' => $input->getArgument('hostname'),
-			'user' => $input->getArgument('username'),
-			'password' => $input->getOption('password'),
-			'dbname' => $input->getArgument('database'),
-		]);
-		if ($input->getOption('port')) {
-			$connectionParams['port'] = $input->getOption('port');
-		}
-		return $this->connectionFactory->getConnection($type, $connectionParams);
-	}
-
-	protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
-		$toTables = $this->getTables($db);
-		if (!empty($toTables)) {
-			$output->writeln('<info>Clearing schema in new database</info>');
-		}
-		foreach($toTables as $table) {
-			$db->getSchemaManager()->dropTable($table);
-		}
-	}
-
-	protected function getTables(Connection $db) {
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-		$db->getConfiguration()->
-			setFilterSchemaAssetsExpression($filterExpression);
-		return $db->getSchemaManager()->listTableNames();
-	}
-
-	/**
-	 * @param Connection $fromDB
-	 * @param Connection $toDB
-	 * @param Table $table
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @suppress SqlInjectionChecker
-	 */
-	protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
-		if ($table->getName() === $toDB->getPrefix() . 'migrations') {
-			$output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
-			return;
-		}
-
-		$chunkSize = $input->getOption('chunk-size');
-
-		$query = $fromDB->getQueryBuilder();
-		$query->automaticTablePrefix(false);
-		$query->select($query->func()->count('*', 'num_entries'))
-			->from($table->getName());
-		$result = $query->execute();
-		$count = $result->fetchColumn();
-		$result->closeCursor();
-
-		$numChunks = ceil($count/$chunkSize);
-		if ($numChunks > 1) {
-			$output->writeln('chunked query, ' . $numChunks . ' chunks');
-		}
-
-		$progress = new ProgressBar($output, $count);
-		$progress->start();
-		$redraw = $count > $chunkSize ? 100 : ($count > 100 ? 5 : 1);
-		$progress->setRedrawFrequency($redraw);
-
-		$query = $fromDB->getQueryBuilder();
-		$query->automaticTablePrefix(false);
-		$query->select('*')
-			->from($table->getName())
-			->setMaxResults($chunkSize);
-
-		try {
-			$orderColumns = $table->getPrimaryKeyColumns();
-		} catch (DBALException $e) {
-			$orderColumns = [];
-			foreach ($table->getColumns() as $column) {
-				$orderColumns[] = $column->getName();
-			}
-		}
-
-		foreach ($orderColumns as $column) {
-			$query->addOrderBy($column);
-		}
-
-		$insertQuery = $toDB->getQueryBuilder();
-		$insertQuery->automaticTablePrefix(false);
-		$insertQuery->insert($table->getName());
-		$parametersCreated = false;
-
-		for ($chunk = 0; $chunk < $numChunks; $chunk++) {
-			$query->setFirstResult($chunk * $chunkSize);
-
-			$result = $query->execute();
-
-			while ($row = $result->fetch()) {
-				$progress->advance();
-				if (!$parametersCreated) {
-					foreach ($row as $key => $value) {
-						$insertQuery->setValue($key, $insertQuery->createParameter($key));
-					}
-					$parametersCreated = true;
-				}
-
-				foreach ($row as $key => $value) {
-					$type = $this->getColumnType($table, $key);
-					if ($type !== false) {
-						$insertQuery->setParameter($key, $value, $type);
-					} else {
-						$insertQuery->setParameter($key, $value);
-					}
-				}
-				$insertQuery->execute();
-			}
-			$result->closeCursor();
-		}
-		$progress->finish();
-	}
-
-	protected function getColumnType(Table $table, $columnName) {
-		$tableName = $table->getName();
-		if (isset($this->columnTypes[$tableName][$columnName])) {
-			return $this->columnTypes[$tableName][$columnName];
-		}
-
-		$type = $table->getColumn($columnName)->getType()->getName();
-
-		switch ($type) {
-			case Type::BLOB:
-			case Type::TEXT:
-				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
-				break;
-			case Type::BOOLEAN:
-				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_BOOL;
-				break;
-			default:
-				$this->columnTypes[$tableName][$columnName] = false;
-		}
-
-		return $this->columnTypes[$tableName][$columnName];
-	}
-
-	protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
-		$this->config->setSystemValue('maintenance', true);
-		$schema = $fromDB->createSchema();
-
-		try {
-			// copy table rows
-			foreach($tables as $table) {
-				$output->writeln($table);
-				$this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
-			}
-			if ($input->getArgument('type') === 'pgsql') {
-				$tools = new \OC\DB\PgSqlTools($this->config);
-				$tools->resynchronizeDatabaseSequences($toDB);
-			}
-			// save new database config
-			$this->saveDBInfo($input);
-		} catch(\Exception $e) {
-			$this->config->setSystemValue('maintenance', false);
-			throw $e;
-		}
-		$this->config->setSystemValue('maintenance', false);
-	}
-
-	protected function saveDBInfo(InputInterface $input) {
-		$type = $input->getArgument('type');
-		$username = $input->getArgument('username');
-		$dbHost = $input->getArgument('hostname');
-		$dbName = $input->getArgument('database');
-		$password = $input->getOption('password');
-		if ($input->getOption('port')) {
-			$dbHost .= ':'.$input->getOption('port');
-		}
-
-		$this->config->setSystemValues([
-			'dbtype'		=> $type,
-			'dbname'		=> $dbName,
-			'dbhost'		=> $dbHost,
-			'dbuser'		=> $username,
-			'dbpassword'	=> $password,
-		]);
-	}
-
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'type') {
-			return ['mysql', 'oci', 'pgsql'];
-		}
-		return [];
-	}
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var \OC\DB\ConnectionFactory
+     */
+    protected $connectionFactory;
+
+    /** @var array */
+    protected $columnTypes;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OC\DB\ConnectionFactory $connectionFactory
+     */
+    public function __construct(IConfig $config, ConnectionFactory $connectionFactory) {
+        $this->config = $config;
+        $this->connectionFactory = $connectionFactory;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:convert-type')
+            ->setDescription('Convert the Nextcloud database to the newly configured one')
+            ->addArgument(
+                'type',
+                InputArgument::REQUIRED,
+                'the type of the database to convert to'
+            )
+            ->addArgument(
+                'username',
+                InputArgument::REQUIRED,
+                'the username of the database to convert to'
+            )
+            ->addArgument(
+                'hostname',
+                InputArgument::REQUIRED,
+                'the hostname of the database to convert to'
+            )
+            ->addArgument(
+                'database',
+                InputArgument::REQUIRED,
+                'the name of the database to convert to'
+            )
+            ->addOption(
+                'port',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the port of the database to convert to'
+            )
+            ->addOption(
+                'password',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
+            )
+            ->addOption(
+                'clear-schema',
+                null,
+                InputOption::VALUE_NONE,
+                'remove all tables from the destination database'
+            )
+            ->addOption(
+                'all-apps',
+                null,
+                InputOption::VALUE_NONE,
+                'whether to create schema for all apps instead of only installed apps'
+            )
+            ->addOption(
+                'chunk-size',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the maximum number of database rows to handle in a single query, bigger tables will be handled in chunks of this size. Lower this if the process runs out of memory during conversion.',
+                1000
+            )
+        ;
+    }
+
+    protected function validateInput(InputInterface $input, OutputInterface $output) {
+        $type = $this->connectionFactory->normalizeType($input->getArgument('type'));
+        if ($type === 'sqlite3') {
+            throw new \InvalidArgumentException(
+                'Converting to SQLite (sqlite3) is currently not supported.'
+            );
+        }
+        if ($type === $this->config->getSystemValue('dbtype', '')) {
+            throw new \InvalidArgumentException(sprintf(
+                'Can not convert from %1$s to %1$s.',
+                $type
+            ));
+        }
+        if ($type === 'oci' && $input->getOption('clear-schema')) {
+            // Doctrine unconditionally tries (at least in version 2.3)
+            // to drop sequence triggers when dropping a table, even though
+            // such triggers may not exist. This results in errors like
+            // "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
+            throw new \InvalidArgumentException(
+                'The --clear-schema option is not supported when converting to Oracle (oci).'
+            );
+        }
+    }
+
+    protected function readPassword(InputInterface $input, OutputInterface $output) {
+        // Explicitly specified password
+        if ($input->getOption('password')) {
+            return;
+        }
+
+        // Read from stdin. stream_set_blocking is used to prevent blocking
+        // when nothing is passed via stdin.
+        stream_set_blocking(STDIN, 0);
+        $password = file_get_contents('php://stdin');
+        stream_set_blocking(STDIN, 1);
+        if (trim($password) !== '') {
+            $input->setOption('password', $password);
+            return;
+        }
+
+        // Read password by interacting
+        if ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new Question('What is the database password?');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $password = $helper->ask($input, $output, $question);
+            $input->setOption('password', $password);
+            return;
+        }
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $this->validateInput($input, $output);
+        $this->readPassword($input, $output);
+
+        $fromDB = \OC::$server->getDatabaseConnection();
+        $toDB = $this->getToDBConnection($input, $output);
+
+        if ($input->getOption('clear-schema')) {
+            $this->clearSchema($toDB, $input, $output);
+        }
+
+        $this->createSchema($fromDB, $toDB, $input, $output);
+
+        $toTables = $this->getTables($toDB);
+        $fromTables = $this->getTables($fromDB);
+
+        // warn/fail if there are more tables in 'from' database
+        $extraFromTables = array_diff($fromTables, $toTables);
+        if (!empty($extraFromTables)) {
+            $output->writeln('<comment>The following tables will not be converted:</comment>');
+            $output->writeln($extraFromTables);
+            if (!$input->getOption('all-apps')) {
+                $output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
+                $output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
+            }
+
+            $continueConversion = !$input->isInteractive(); // assume yes for --no-interaction and no otherwise.
+            $question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', $continueConversion);
+
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (!$helper->ask($input, $output, $question)) {
+                return;
+            }
+        }
+        $intersectingTables = array_intersect($toTables, $fromTables);
+        $this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
+    }
+
+    protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) {
+        $output->writeln('<info>Creating schema in new database</info>');
+
+        $fromMS = new MigrationService('core', $fromDB);
+        $currentMigration = $fromMS->getMigration('current');
+        if ($currentMigration !== '0') {
+            $toMS = new MigrationService('core', $toDB);
+            $toMS->migrate($currentMigration);
+        }
+
+        $schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
+        $apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
+        foreach($apps as $app) {
+            if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
+                $schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
+            } else {
+                // Make sure autoloading works...
+                \OC_App::loadApp($app);
+                $fromMS = new MigrationService($app, $fromDB);
+                $currentMigration = $fromMS->getMigration('current');
+                if ($currentMigration !== '0') {
+                    $toMS = new MigrationService($app, $toDB);
+                    $toMS->migrate($currentMigration, true);
+                }
+            }
+        }
+    }
+
+    protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
+        $type = $input->getArgument('type');
+        $connectionParams = $this->connectionFactory->createConnectionParams();
+        $connectionParams = array_merge($connectionParams, [
+            'host' => $input->getArgument('hostname'),
+            'user' => $input->getArgument('username'),
+            'password' => $input->getOption('password'),
+            'dbname' => $input->getArgument('database'),
+        ]);
+        if ($input->getOption('port')) {
+            $connectionParams['port'] = $input->getOption('port');
+        }
+        return $this->connectionFactory->getConnection($type, $connectionParams);
+    }
+
+    protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
+        $toTables = $this->getTables($db);
+        if (!empty($toTables)) {
+            $output->writeln('<info>Clearing schema in new database</info>');
+        }
+        foreach($toTables as $table) {
+            $db->getSchemaManager()->dropTable($table);
+        }
+    }
+
+    protected function getTables(Connection $db) {
+        $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+        $db->getConfiguration()->
+            setFilterSchemaAssetsExpression($filterExpression);
+        return $db->getSchemaManager()->listTableNames();
+    }
+
+    /**
+     * @param Connection $fromDB
+     * @param Connection $toDB
+     * @param Table $table
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @suppress SqlInjectionChecker
+     */
+    protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
+        if ($table->getName() === $toDB->getPrefix() . 'migrations') {
+            $output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
+            return;
+        }
+
+        $chunkSize = $input->getOption('chunk-size');
+
+        $query = $fromDB->getQueryBuilder();
+        $query->automaticTablePrefix(false);
+        $query->select($query->func()->count('*', 'num_entries'))
+            ->from($table->getName());
+        $result = $query->execute();
+        $count = $result->fetchColumn();
+        $result->closeCursor();
+
+        $numChunks = ceil($count/$chunkSize);
+        if ($numChunks > 1) {
+            $output->writeln('chunked query, ' . $numChunks . ' chunks');
+        }
+
+        $progress = new ProgressBar($output, $count);
+        $progress->start();
+        $redraw = $count > $chunkSize ? 100 : ($count > 100 ? 5 : 1);
+        $progress->setRedrawFrequency($redraw);
+
+        $query = $fromDB->getQueryBuilder();
+        $query->automaticTablePrefix(false);
+        $query->select('*')
+            ->from($table->getName())
+            ->setMaxResults($chunkSize);
+
+        try {
+            $orderColumns = $table->getPrimaryKeyColumns();
+        } catch (DBALException $e) {
+            $orderColumns = [];
+            foreach ($table->getColumns() as $column) {
+                $orderColumns[] = $column->getName();
+            }
+        }
+
+        foreach ($orderColumns as $column) {
+            $query->addOrderBy($column);
+        }
+
+        $insertQuery = $toDB->getQueryBuilder();
+        $insertQuery->automaticTablePrefix(false);
+        $insertQuery->insert($table->getName());
+        $parametersCreated = false;
+
+        for ($chunk = 0; $chunk < $numChunks; $chunk++) {
+            $query->setFirstResult($chunk * $chunkSize);
+
+            $result = $query->execute();
+
+            while ($row = $result->fetch()) {
+                $progress->advance();
+                if (!$parametersCreated) {
+                    foreach ($row as $key => $value) {
+                        $insertQuery->setValue($key, $insertQuery->createParameter($key));
+                    }
+                    $parametersCreated = true;
+                }
+
+                foreach ($row as $key => $value) {
+                    $type = $this->getColumnType($table, $key);
+                    if ($type !== false) {
+                        $insertQuery->setParameter($key, $value, $type);
+                    } else {
+                        $insertQuery->setParameter($key, $value);
+                    }
+                }
+                $insertQuery->execute();
+            }
+            $result->closeCursor();
+        }
+        $progress->finish();
+    }
+
+    protected function getColumnType(Table $table, $columnName) {
+        $tableName = $table->getName();
+        if (isset($this->columnTypes[$tableName][$columnName])) {
+            return $this->columnTypes[$tableName][$columnName];
+        }
+
+        $type = $table->getColumn($columnName)->getType()->getName();
+
+        switch ($type) {
+            case Type::BLOB:
+            case Type::TEXT:
+                $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
+                break;
+            case Type::BOOLEAN:
+                $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_BOOL;
+                break;
+            default:
+                $this->columnTypes[$tableName][$columnName] = false;
+        }
+
+        return $this->columnTypes[$tableName][$columnName];
+    }
+
+    protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
+        $this->config->setSystemValue('maintenance', true);
+        $schema = $fromDB->createSchema();
+
+        try {
+            // copy table rows
+            foreach($tables as $table) {
+                $output->writeln($table);
+                $this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
+            }
+            if ($input->getArgument('type') === 'pgsql') {
+                $tools = new \OC\DB\PgSqlTools($this->config);
+                $tools->resynchronizeDatabaseSequences($toDB);
+            }
+            // save new database config
+            $this->saveDBInfo($input);
+        } catch(\Exception $e) {
+            $this->config->setSystemValue('maintenance', false);
+            throw $e;
+        }
+        $this->config->setSystemValue('maintenance', false);
+    }
+
+    protected function saveDBInfo(InputInterface $input) {
+        $type = $input->getArgument('type');
+        $username = $input->getArgument('username');
+        $dbHost = $input->getArgument('hostname');
+        $dbName = $input->getArgument('database');
+        $password = $input->getOption('password');
+        if ($input->getOption('port')) {
+            $dbHost .= ':'.$input->getOption('port');
+        }
+
+        $this->config->setSystemValues([
+            'dbtype'		=> $type,
+            'dbname'		=> $dbName,
+            'dbhost'		=> $dbHost,
+            'dbuser'		=> $username,
+            'dbpassword'	=> $password,
+        ]);
+    }
+
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'type') {
+            return ['mysql', 'oci', 'pgsql'];
+        }
+        return [];
+    }
 }

apps/files_external/lib/Controller/GlobalStoragesController.php

Spacing +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
 		} catch (NotFoundException $e) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', [$id])
+					'message' => (string) $this->l10n->t('Storage with ID "%d" not found', [$id])
 				],
 				Http::STATUS_NOT_FOUND
 			);

Indentation +145 added lines, -145 removed lines

@@ -40,151 +40,151 @@
  * Global storages controller
  */
 class GlobalStoragesController extends StoragesController {
-	/**
-	 * Creates a new global storages controller.
-	 *
-	 * @param string $AppName application name
-	 * @param IRequest $request request object
-	 * @param IL10N $l10n l10n service
-	 * @param GlobalStoragesService $globalStoragesService storage service
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$AppName,
-		IRequest $request,
-		IL10N $l10n,
-		GlobalStoragesService $globalStoragesService,
-		ILogger $logger
-	) {
-		parent::__construct(
-			$AppName,
-			$request,
-			$l10n,
-			$globalStoragesService,
-			$logger
-		);
-	}
-
-	/**
-	 * Create an external storage entry.
-	 *
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechanism identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 *
-	 * @return DataResponse
-	 */
-	public function create(
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority
-	) {
-		$newStorage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($newStorage instanceof DataResponse) {
-			return $newStorage;
-		}
-
-		$response = $this->validate($newStorage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		$newStorage = $this->service->addStorage($newStorage);
-
-		$this->updateStorageStatus($newStorage);
-
-		return new DataResponse(
-			$this->formatStorageForUI($newStorage),
-			Http::STATUS_CREATED
-		);
-	}
-
-	/**
-	 * Update an external storage entry.
-	 *
-	 * @param int $id storage id
-	 * @param string $mountPoint storage mount point
-	 * @param string $backend backend identifier
-	 * @param string $authMechanism authentication mechansim identifier
-	 * @param array $backendOptions backend-specific options
-	 * @param array $mountOptions mount-specific options
-	 * @param array $applicableUsers users for which to mount the storage
-	 * @param array $applicableGroups groups for which to mount the storage
-	 * @param int $priority priority
-	 * @param bool $testOnly whether to storage should only test the connection or do more things
-	 *
-	 * @return DataResponse
-	 */
-	public function update(
-		$id,
-		$mountPoint,
-		$backend,
-		$authMechanism,
-		$backendOptions,
-		$mountOptions,
-		$applicableUsers,
-		$applicableGroups,
-		$priority,
-		$testOnly = true
-	) {
-		$storage = $this->createStorage(
-			$mountPoint,
-			$backend,
-			$authMechanism,
-			$backendOptions,
-			$mountOptions,
-			$applicableUsers,
-			$applicableGroups,
-			$priority
-		);
-		if ($storage instanceof DataResponse) {
-			return $storage;
-		}
-		$storage->setId($id);
-
-		$response = $this->validate($storage);
-		if (!empty($response)) {
-			return $response;
-		}
-
-		try {
-			$storage = $this->service->updateStorage($storage);
-		} catch (NotFoundException $e) {
-			return new DataResponse(
-				[
-					'message' => (string)$this->l10n->t('Storage with ID "%d" not found', [$id])
-				],
-				Http::STATUS_NOT_FOUND
-			);
-		}
-
-		$this->updateStorageStatus($storage, $testOnly);
-
-		return new DataResponse(
-			$this->formatStorageForUI($storage),
-			Http::STATUS_OK
-		);
-
-	}
+    /**
+     * Creates a new global storages controller.
+     *
+     * @param string $AppName application name
+     * @param IRequest $request request object
+     * @param IL10N $l10n l10n service
+     * @param GlobalStoragesService $globalStoragesService storage service
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $AppName,
+        IRequest $request,
+        IL10N $l10n,
+        GlobalStoragesService $globalStoragesService,
+        ILogger $logger
+    ) {
+        parent::__construct(
+            $AppName,
+            $request,
+            $l10n,
+            $globalStoragesService,
+            $logger
+        );
+    }
+
+    /**
+     * Create an external storage entry.
+     *
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechanism identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     *
+     * @return DataResponse
+     */
+    public function create(
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority
+    ) {
+        $newStorage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($newStorage instanceof DataResponse) {
+            return $newStorage;
+        }
+
+        $response = $this->validate($newStorage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        $newStorage = $this->service->addStorage($newStorage);
+
+        $this->updateStorageStatus($newStorage);
+
+        return new DataResponse(
+            $this->formatStorageForUI($newStorage),
+            Http::STATUS_CREATED
+        );
+    }
+
+    /**
+     * Update an external storage entry.
+     *
+     * @param int $id storage id
+     * @param string $mountPoint storage mount point
+     * @param string $backend backend identifier
+     * @param string $authMechanism authentication mechansim identifier
+     * @param array $backendOptions backend-specific options
+     * @param array $mountOptions mount-specific options
+     * @param array $applicableUsers users for which to mount the storage
+     * @param array $applicableGroups groups for which to mount the storage
+     * @param int $priority priority
+     * @param bool $testOnly whether to storage should only test the connection or do more things
+     *
+     * @return DataResponse
+     */
+    public function update(
+        $id,
+        $mountPoint,
+        $backend,
+        $authMechanism,
+        $backendOptions,
+        $mountOptions,
+        $applicableUsers,
+        $applicableGroups,
+        $priority,
+        $testOnly = true
+    ) {
+        $storage = $this->createStorage(
+            $mountPoint,
+            $backend,
+            $authMechanism,
+            $backendOptions,
+            $mountOptions,
+            $applicableUsers,
+            $applicableGroups,
+            $priority
+        );
+        if ($storage instanceof DataResponse) {
+            return $storage;
+        }
+        $storage->setId($id);
+
+        $response = $this->validate($storage);
+        if (!empty($response)) {
+            return $response;
+        }
+
+        try {
+            $storage = $this->service->updateStorage($storage);
+        } catch (NotFoundException $e) {
+            return new DataResponse(
+                [
+                    'message' => (string)$this->l10n->t('Storage with ID "%d" not found', [$id])
+                ],
+                Http::STATUS_NOT_FOUND
+            );
+        }
+
+        $this->updateStorageStatus($storage, $testOnly);
+
+        return new DataResponse(
+            $this->formatStorageForUI($storage),
+            Http::STATUS_OK
+        );
+
+    }
 
 
 }

lib/private/App/AppStore/Bundles/EducationBundle.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	 * {@inheritDoc}
 	 */
 	public function getName() {
-		return (string)$this->l10n->t('Education Edition');
+		return (string) $this->l10n->t('Education Edition');
 	}
 
 	/**

Indentation +21 added lines, -21 removed lines

@@ -25,27 +25,27 @@
 
 class EducationBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return (string)$this->l10n->t('Education Edition');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return (string)$this->l10n->t('Education Edition');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'zenodo',
-			'dashboard',
-			'circles',
-			'groupfolders',
-			'announcementcenter',
-			'quota_warning',
-			'orcid',
-			'user_saml',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'zenodo',
+            'dashboard',
+            'circles',
+            'groupfolders',
+            'announcementcenter',
+            'quota_warning',
+            'orcid',
+            'user_saml',
+        ];
+    }
 
 }

core/templates/403.php

Indentation +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@
 <?php
 // @codeCoverageIgnoreStart
 if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
-	require_once '../../lib/base.php';
+    require_once '../../lib/base.php';
 
-	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
-	exit;
+    $urlGenerator = \OC::$server->getURLGenerator();
+    header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+    exit;
 }
 // @codeCoverageIgnoreEnd
 ?>

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <?php
 // @codeCoverageIgnoreStart
-if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
+if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
 	require_once '../../lib/base.php';
 
 	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
 	exit;
 }
 // @codeCoverageIgnoreEnd
 ?>
 <ul>
 	<li class='error'>
-		<?php p($l->t( 'Access forbidden' )); ?><br>
-		<p class='hint'><?php if(isset($_['message'])) p($_['message'])?></p>
+		<?php p($l->t('Access forbidden')); ?><br>
+		<p class='hint'><?php if (isset($_['message'])) p($_['message'])?></p>
 	</li>
 </ul>

core/templates/404.php

Indentation +4 added lines, -4 removed lines

@@ -4,11 +4,11 @@
 /** @var $theme OCP\Defaults */
 // @codeCoverageIgnoreStart
 if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
-	require_once '../../lib/base.php';
+    require_once '../../lib/base.php';
 
-	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
-	exit;
+    $urlGenerator = \OC::$server->getURLGenerator();
+    header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+    exit;
 }
 // @codeCoverageIgnoreEnd
 ?>

Spacing +2 added lines, -2 removed lines

@@ -3,11 +3,11 @@
 /** @var $l \OCP\IL10N */
 /** @var $theme OCP\Defaults */
 // @codeCoverageIgnoreStart
-if(!isset($_)) {//standalone  page is not supported anymore - redirect to /
+if (!isset($_)) {//standalone  page is not supported anymore - redirect to /
 	require_once '../../lib/base.php';
 
 	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
 	exit;
 }
 // @codeCoverageIgnoreEnd

Braces +5 added lines, -2 removed lines

@@ -14,10 +14,13 @@
 ?>
 <?php if (isset($_['content'])): ?>
 	<?php print_unescaped($_['content']) ?>
-<?php else: ?>
+<?php else {
+    : ?>
 	<div class="body-login-container update">
 		<div class="icon-big icon-search icon-white"></div>
-		<h2><?php p($l->t('File not found')); ?></h2>
+		<h2><?php p($l->t('File not found'));
+}
+?></h2>
 		<p class="infogroup"><?php p($l->t('The document could not be found on the server. Maybe the share was deleted or has expired?')); ?></p>
 		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
 			<?php p($l->t('Back to %s', [$theme->getName()])); ?>