nextcloud / server

core/Command/Db/ConvertType.php

Indentation +414 added lines, -414 removed lines

@@ -57,418 +57,418 @@
 use function preg_quote;
 
 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): int {
-		$this->validateInput($input, $output);
-		$this->readPassword($input, $output);
-
-		/** @var Connection $fromDB */
-		$fromDB = \OC::$server->get(Connection::class);
-		$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 1;
-			}
-		}
-		$intersectingTables = array_intersect($toTables, $fromTables);
-		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
-		return 0;
-	}
-
-	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);
-		}
-
-		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
-		foreach ($apps as $app) {
-			$output->writeln('<info> - '.$app.'</info>');
-			// 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) {
-		$db->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
-			/** @var string|AbstractAsset $asset */
-			$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-			if ($asset instanceof AbstractAsset) {
-				return preg_match($filterExpression, $asset->getName()) !== false;
-			}
-			return preg_match($filterExpression, $asset) !== false;
-		});
-		return $db->getSchemaManager()->listTableNames();
-	}
-
-	/**
-	 * @param Connection $fromDB
-	 * @param Connection $toDB
-	 * @param Table $table
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	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->fetchOne();
-		$result->closeCursor();
-
-		$numChunks = ceil($count / $chunkSize);
-		if ($numChunks > 1) {
-			$output->writeln('chunked query, ' . $numChunks . ' chunks');
-		}
-
-		$progress = new ProgressBar($output, $count);
-		$progress->setFormat('very_verbose');
-		$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 (Exception $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();
-		$output->writeln('');
-	}
-
-	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 Types::BLOB:
-			case Types::TEXT:
-				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
-				break;
-			case Types::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('<info> - '.$table.'</info>');
-				$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): int {
+        $this->validateInput($input, $output);
+        $this->readPassword($input, $output);
+
+        /** @var Connection $fromDB */
+        $fromDB = \OC::$server->get(Connection::class);
+        $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 1;
+            }
+        }
+        $intersectingTables = array_intersect($toTables, $fromTables);
+        $this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
+        return 0;
+    }
+
+    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);
+        }
+
+        $apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
+        foreach ($apps as $app) {
+            $output->writeln('<info> - '.$app.'</info>');
+            // 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) {
+        $db->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+            /** @var string|AbstractAsset $asset */
+            $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+            if ($asset instanceof AbstractAsset) {
+                return preg_match($filterExpression, $asset->getName()) !== false;
+            }
+            return preg_match($filterExpression, $asset) !== false;
+        });
+        return $db->getSchemaManager()->listTableNames();
+    }
+
+    /**
+     * @param Connection $fromDB
+     * @param Connection $toDB
+     * @param Table $table
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    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->fetchOne();
+        $result->closeCursor();
+
+        $numChunks = ceil($count / $chunkSize);
+        if ($numChunks > 1) {
+            $output->writeln('chunked query, ' . $numChunks . ' chunks');
+        }
+
+        $progress = new ProgressBar($output, $count);
+        $progress->setFormat('very_verbose');
+        $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 (Exception $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();
+        $output->writeln('');
+    }
+
+    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 Types::BLOB:
+            case Types::TEXT:
+                $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
+                break;
+            case Types::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('<info> - '.$table.'</info>');
+                $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 [];
+    }
 }

core/register_command.php

Indentation +131 added lines, -131 removed lines

@@ -54,146 +54,146 @@
 $application->add(new OC\Core\Command\App\CheckCode());
 $application->add(new OC\Core\Command\L10n\CreateJs());
 $application->add(new \OC\Core\Command\Integrity\SignApp(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
-		\OC::$server->getURLGenerator()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
+        \OC::$server->getURLGenerator()
 ));
 $application->add(new \OC\Core\Command\Integrity\SignCore(
-		\OC::$server->getIntegrityCodeChecker(),
-		new \OC\IntegrityCheck\Helpers\FileAccessHelper()
+        \OC::$server->getIntegrityCodeChecker(),
+        new \OC\IntegrityCheck\Helpers\FileAccessHelper()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckApp(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckCore(
-		\OC::$server->getIntegrityCodeChecker()
+        \OC::$server->getIntegrityCodeChecker()
 ));
 
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
-	$application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\App\Install());
-	$application->add(new OC\Core\Command\App\GetPath());
-	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->query(\OC\Installer::class), \OC::$server->getLogger()));
-	$application->add(\OC::$server->query(\OC\Core\Command\App\Update::class));
-
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Cleanup::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enforce::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enable::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Disable::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\State::class));
-
-	$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
-
-	$application->add(\OC::$server->query(\OC\Core\Command\Broadcast\Test::class));
-
-	$application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
-	$application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
-	$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
-
-	$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
-	$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
-	$application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->get(\OC\DB\Connection::class)));
-	$application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));
-	$application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));
-	$application->add(new OC\Core\Command\Db\AddMissingPrimaryKeys(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));
-	$application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->get(\OC\DB\Connection::class)));
-	$application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->get(\OC\DB\Connection::class)));
-	$application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getConfig()));
-
-	$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
-	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
-	$application->add(new OC\Core\Command\Encryption\DecryptAll(
-		\OC::$server->getEncryptionManager(),
-		\OC::$server->getAppManager(),
-		\OC::$server->getConfig(),
-		new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
-		new \Symfony\Component\Console\Helper\QuestionHelper())
-	);
-
-	$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
-
-	$view = new \OC\Files\View();
-	$util = new \OC\Encryption\Util(
-		$view,
-		\OC::$server->getUserManager(),
-		\OC::$server->getGroupManager(),
-		\OC::$server->getConfig()
-	);
-	$application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
-			$view,
-			\OC::$server->getUserManager(),
-			\OC::$server->getConfig(),
-			$util,
-			new \Symfony\Component\Console\Helper\QuestionHelper()
-		)
-	);
-	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
-	$application->add(new OC\Core\Command\Encryption\MigrateKeyStorage(
-			$view,
-			\OC::$server->getUserManager(),
-			\OC::$server->getConfig(),
-			$util,
-			\OC::$server->getCrypto()
-		)
-	);
-
-	$application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
-	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
-	$application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
-
-	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
-	$application->add(new OC\Core\Command\Maintenance\Repair(
-		new \OC\Repair([], \OC::$server->getEventDispatcher(), \OC::$server->get(LoggerInterface::class)),
-		\OC::$server->getConfig(),
-		\OC::$server->getEventDispatcher(),
-		\OC::$server->getAppManager()
-	));
-
-	$application->add(\OC::$server->query(\OC\Core\Command\Preview\Repair::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\Preview\ResetRenderedTexts::class));
-
-	$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
-	$application->add(\OC::$server->get(\OC\Core\Command\User\Report::class));
-	$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
-	$application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\User\AddAppPassword(\OC::$server->get(\OCP\IUserManager::class), \OC::$server->get(\OC\Authentication\Token\IProvider::class), \OC::$server->get(\OCP\Security\ISecureRandom::class), \OC::$server->get(\OCP\Security\ICrypto::class)));
-
-	$application->add(new OC\Core\Command\Group\Add(\OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\Delete(\OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
-	$application->add(new OC\Core\Command\Group\Info(\OC::$server->get(\OCP\IGroupManager::class)));
-
-	$application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(), \OC::$server->getL10N('core')));
-	$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager()));
-	$application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager()));
-	$application->add(new OC\Core\Command\Security\ResetBruteforceAttempts(\OC::$server->getBruteForceThrottler()));
+    $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\App\Install());
+    $application->add(new OC\Core\Command\App\GetPath());
+    $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->query(\OC\Installer::class), \OC::$server->getLogger()));
+    $application->add(\OC::$server->query(\OC\Core\Command\App\Update::class));
+
+    $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Cleanup::class));
+    $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enforce::class));
+    $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enable::class));
+    $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Disable::class));
+    $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\State::class));
+
+    $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
+
+    $application->add(\OC::$server->query(\OC\Core\Command\Broadcast\Test::class));
+
+    $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
+    $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
+    $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
+
+    $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
+    $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
+    $application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->get(\OC\DB\Connection::class)));
+    $application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));
+    $application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));
+    $application->add(new OC\Core\Command\Db\AddMissingPrimaryKeys(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));
+    $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->get(\OC\DB\Connection::class)));
+    $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->get(\OC\DB\Connection::class)));
+    $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getConfig()));
+
+    $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
+    $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
+    $application->add(new OC\Core\Command\Encryption\DecryptAll(
+        \OC::$server->getEncryptionManager(),
+        \OC::$server->getAppManager(),
+        \OC::$server->getConfig(),
+        new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
+        new \Symfony\Component\Console\Helper\QuestionHelper())
+    );
+
+    $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
+
+    $view = new \OC\Files\View();
+    $util = new \OC\Encryption\Util(
+        $view,
+        \OC::$server->getUserManager(),
+        \OC::$server->getGroupManager(),
+        \OC::$server->getConfig()
+    );
+    $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
+            $view,
+            \OC::$server->getUserManager(),
+            \OC::$server->getConfig(),
+            $util,
+            new \Symfony\Component\Console\Helper\QuestionHelper()
+        )
+    );
+    $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
+    $application->add(new OC\Core\Command\Encryption\MigrateKeyStorage(
+            $view,
+            \OC::$server->getUserManager(),
+            \OC::$server->getConfig(),
+            $util,
+            \OC::$server->getCrypto()
+        )
+    );
+
+    $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
+    $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
+    $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
+    $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
+    $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
+
+    $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
+    $application->add(new OC\Core\Command\Maintenance\Repair(
+        new \OC\Repair([], \OC::$server->getEventDispatcher(), \OC::$server->get(LoggerInterface::class)),
+        \OC::$server->getConfig(),
+        \OC::$server->getEventDispatcher(),
+        \OC::$server->getAppManager()
+    ));
+
+    $application->add(\OC::$server->query(\OC\Core\Command\Preview\Repair::class));
+    $application->add(\OC::$server->query(\OC\Core\Command\Preview\ResetRenderedTexts::class));
+
+    $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
+    $application->add(\OC::$server->get(\OC\Core\Command\User\Report::class));
+    $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
+    $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\User\AddAppPassword(\OC::$server->get(\OCP\IUserManager::class), \OC::$server->get(\OC\Authentication\Token\IProvider::class), \OC::$server->get(\OCP\Security\ISecureRandom::class), \OC::$server->get(\OCP\Security\ICrypto::class)));
+
+    $application->add(new OC\Core\Command\Group\Add(\OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\Delete(\OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
+    $application->add(new OC\Core\Command\Group\Info(\OC::$server->get(\OCP\IGroupManager::class)));
+
+    $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(), \OC::$server->getL10N('core')));
+    $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager()));
+    $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager()));
+    $application->add(new OC\Core\Command\Security\ResetBruteforceAttempts(\OC::$server->getBruteForceThrottler()));
 } else {
-	$application->add(\OC::$server->get(\OC\Core\Command\Maintenance\Install::class));
+    $application->add(\OC::$server->get(\OC\Core\Command\Maintenance\Install::class));
 }

lib/private/Installer.php

Indentation +582 added lines, -582 removed lines

@@ -59,586 +59,586 @@
  * This class provides the functionality needed to install, update and remove apps
  */
 class Installer {
-	/** @var AppFetcher */
-	private $appFetcher;
-	/** @var IClientService */
-	private $clientService;
-	/** @var ITempManager */
-	private $tempManager;
-	/** @var ILogger */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-	/** @var array - for caching the result of app fetcher */
-	private $apps = null;
-	/** @var bool|null - for caching the result of the ready status */
-	private $isInstanceReadyForUpdates = null;
-	/** @var bool */
-	private $isCLI;
-
-	/**
-	 * @param AppFetcher $appFetcher
-	 * @param IClientService $clientService
-	 * @param ITempManager $tempManager
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		AppFetcher $appFetcher,
-		IClientService $clientService,
-		ITempManager $tempManager,
-		ILogger $logger,
-		IConfig $config,
-		bool $isCLI
-	) {
-		$this->appFetcher = $appFetcher;
-		$this->clientService = $clientService;
-		$this->tempManager = $tempManager;
-		$this->logger = $logger;
-		$this->config = $config;
-		$this->isCLI = $isCLI;
-	}
-
-	/**
-	 * Installs an app that is located in one of the app folders already
-	 *
-	 * @param string $appId App to install
-	 * @param bool $forceEnable
-	 * @throws \Exception
-	 * @return string app ID
-	 */
-	public function installApp(string $appId, bool $forceEnable = false): string {
-		$app = \OC_App::findAppInDirectories($appId);
-		if ($app === false) {
-			throw new \Exception('App not found in any app directory');
-		}
-
-		$basedir = $app['path'].'/'.$appId;
-
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
-		}
-
-		$info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
-
-		$l = \OC::$server->getL10N('core');
-
-		if (!is_array($info)) {
-			throw new \Exception(
-				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
-					[$appId]
-				)
-			);
-		}
-
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		$ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
-
-		$version = implode('.', \OCP\Util::getVersion());
-		if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {
-			throw new \Exception(
-				// TODO $l
-				$l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
-					[$info['name']]
-				)
-			);
-		}
-
-		// check for required dependencies
-		\OC_App::checkAppDependencies($this->config, $l, $info, $ignoreMax);
-		/** @var Coordinator $coordinator */
-		$coordinator = \OC::$server->get(Coordinator::class);
-		$coordinator->runLazyRegistration($appId);
-		\OC_App::registerAutoloading($appId, $basedir);
-
-		$previousVersion = $this->config->getAppValue($info['id'], 'installed_version', false);
-		if ($previousVersion) {
-			OC_App::executeRepairSteps($appId, $info['repair-steps']['pre-migration']);
-		}
-
-		//install the database
-		$ms = new MigrationService($info['id'], \OC::$server->get(Connection::class));
-		$ms->migrate('latest', true);
-
-		if ($previousVersion) {
-			OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
-		}
-
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
-
-		$appData = OC_App::getAppInfo($appId);
-		OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
-
-		//set the installed version
-		\OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
-		\OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
-
-		//set remote/public handlers
-		foreach ($info['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
-		}
-		foreach ($info['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * Updates the specified app from the appstore
-	 *
-	 * @param string $appId
-	 * @param bool [$allowUnstable] Allow unstable releases
-	 * @return bool
-	 */
-	public function updateAppstoreApp($appId, $allowUnstable = false) {
-		if ($this->isUpdateAvailable($appId, $allowUnstable)) {
-			try {
-				$this->downloadApp($appId, $allowUnstable);
-			} catch (\Exception $e) {
-				$this->logger->logException($e, [
-					'level' => ILogger::ERROR,
-					'app' => 'core',
-				]);
-				return false;
-			}
-			return OC_App::updateApp($appId);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Split the certificate file in individual certs
-	 *
-	 * @param string $cert
-	 * @return string[]
-	 */
-	private function splitCerts(string $cert): array {
-		preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);
-
-		return $matches[0];
-	}
-
-	/**
-	 * Downloads an app and puts it into the app directory
-	 *
-	 * @param string $appId
-	 * @param bool [$allowUnstable]
-	 *
-	 * @throws \Exception If the installation was not successful
-	 */
-	public function downloadApp($appId, $allowUnstable = false) {
-		$appId = strtolower($appId);
-
-		$apps = $this->appFetcher->get($allowUnstable);
-		foreach ($apps as $app) {
-			if ($app['id'] === $appId) {
-				// Load the certificate
-				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
-				$rootCrts = $this->splitCerts($rootCrt);
-				foreach ($rootCrts as $rootCrt) {
-					$certificate->loadCA($rootCrt);
-				}
-				$loadedCertificate = $certificate->loadX509($app['certificate']);
-
-				// Verify if the certificate has been revoked
-				$crl = new X509();
-				foreach ($rootCrts as $rootCrt) {
-					$crl->loadCA($rootCrt);
-				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if ($crl->validateSignature() !== true) {
-					throw new \Exception('Could not validate CRL signature');
-				}
-				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
-				$revoked = $crl->getRevoked($csn);
-				if ($revoked !== false) {
-					throw new \Exception(
-						sprintf(
-							'Certificate "%s" has been revoked',
-							$csn
-						)
-					);
-				}
-
-				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if ($certificate->validateSignature() !== true) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
-							$appId
-						)
-					);
-				}
-
-				// Verify if the certificate is issued for the requested app id
-				$certInfo = openssl_x509_parse($app['certificate']);
-				if (!isset($certInfo['subject']['CN'])) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert with no CN',
-							$appId
-						)
-					);
-				}
-				if ($certInfo['subject']['CN'] !== $appId) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert issued to %s',
-							$appId,
-							$certInfo['subject']['CN']
-						)
-					);
-				}
-
-				// Download the release
-				$tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
-				$timeout = $this->isCLI ? 0 : 120;
-				$client = $this->clientService->newClient();
-				$client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
-
-				// Check if the signature actually matches the downloaded content
-				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
-				openssl_free_key($certificate);
-
-				if ($verified === true) {
-					// Seems to match, let's proceed
-					$extractDir = $this->tempManager->getTemporaryFolder();
-					$archive = new TAR($tempFile);
-
-					if ($archive) {
-						if (!$archive->extract($extractDir)) {
-							$errorMessage = 'Could not extract app ' . $appId;
-
-							$archiveError = $archive->getError();
-							if ($archiveError instanceof \PEAR_Error) {
-								$errorMessage .= ': ' . $archiveError->getMessage();
-							}
-
-							throw new \Exception($errorMessage);
-						}
-						$allFiles = scandir($extractDir);
-						$folders = array_diff($allFiles, ['.', '..']);
-						$folders = array_values($folders);
-
-						if (count($folders) > 1) {
-							throw new \Exception(
-								sprintf(
-									'Extracted app %s has more than 1 folder',
-									$appId
-								)
-							);
-						}
-
-						// Check if appinfo/info.xml has the same app ID as well
-						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
-						libxml_disable_entity_loader($loadEntities);
-						if ((string)$xml->id !== $appId) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has a wrong app ID in info.xml: %s',
-									$appId,
-									(string)$xml->id
-								)
-							);
-						}
-
-						// Check if the version is lower than before
-						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
-						if (version_compare($currentVersion, $newVersion) === 1) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has version %s and tried to update to lower version %s',
-									$appId,
-									$currentVersion,
-									$newVersion
-								)
-							);
-						}
-
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
-						// Remove old app with the ID if existent
-						OC_Helper::rmdirr($baseDir);
-						// Move to app folder
-						if (@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
-							OC_Helper::copyr($extractDir, $baseDir);
-						}
-						OC_Helper::copyr($extractDir, $baseDir);
-						OC_Helper::rmdirr($extractDir);
-						return;
-					} else {
-						throw new \Exception(
-							sprintf(
-								'Could not extract app with ID %s to %s',
-								$appId,
-								$extractDir
-							)
-						);
-					}
-				} else {
-					// Signature does not match
-					throw new \Exception(
-						sprintf(
-							'App with id %s has invalid signature',
-							$appId
-						)
-					);
-				}
-			}
-		}
-
-		throw new \Exception(
-			sprintf(
-				'Could not download app %s',
-				$appId
-			)
-		);
-	}
-
-	/**
-	 * Check if an update for the app is available
-	 *
-	 * @param string $appId
-	 * @param bool $allowUnstable
-	 * @return string|false false or the version number of the update
-	 */
-	public function isUpdateAvailable($appId, $allowUnstable = false) {
-		if ($this->isInstanceReadyForUpdates === null) {
-			$installPath = OC_App::getInstallPath();
-			if ($installPath === false || $installPath === null) {
-				$this->isInstanceReadyForUpdates = false;
-			} else {
-				$this->isInstanceReadyForUpdates = true;
-			}
-		}
-
-		if ($this->isInstanceReadyForUpdates === false) {
-			return false;
-		}
-
-		if ($this->isInstalledFromGit($appId) === true) {
-			return false;
-		}
-
-		if ($this->apps === null) {
-			$this->apps = $this->appFetcher->get($allowUnstable);
-		}
-
-		foreach ($this->apps as $app) {
-			if ($app['id'] === $appId) {
-				$currentVersion = OC_App::getAppVersion($appId);
-
-				if (!isset($app['releases'][0]['version'])) {
-					return false;
-				}
-				$newestVersion = $app['releases'][0]['version'];
-				if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
-					return $newestVersion;
-				} else {
-					return false;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if app has been installed from git
-	 * @param string $name name of the application to remove
-	 * @return boolean
-	 *
-	 * The function will check if the path contains a .git folder
-	 */
-	private function isInstalledFromGit($appId) {
-		$app = \OC_App::findAppInDirectories($appId);
-		if ($app === false) {
-			return false;
-		}
-		$basedir = $app['path'].'/'.$appId;
-		return file_exists($basedir.'/.git/');
-	}
-
-	/**
-	 * Check if app is already downloaded
-	 * @param string $name name of the application to remove
-	 * @return boolean
-	 *
-	 * The function will check if the app is already downloaded in the apps repository
-	 */
-	public function isDownloaded($name) {
-		foreach (\OC::$APPSROOTS as $dir) {
-			$dirToTest = $dir['path'];
-			$dirToTest .= '/';
-			$dirToTest .= $name;
-			$dirToTest .= '/';
-
-			if (is_dir($dirToTest)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Removes an app
-	 * @param string $appId ID of the application to remove
-	 * @return boolean
-	 *
-	 *
-	 * This function works as follows
-	 *   -# call uninstall repair steps
-	 *   -# removing the files
-	 *
-	 * The function will not delete preferences, tables and the configuration,
-	 * this has to be done by the function oc_app_uninstall().
-	 */
-	public function removeApp($appId) {
-		if ($this->isDownloaded($appId)) {
-			if (\OC::$server->getAppManager()->isShipped($appId)) {
-				return false;
-			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
-			OC_Helper::rmdirr($appDir);
-			return true;
-		} else {
-			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
-
-			return false;
-		}
-	}
-
-	/**
-	 * Installs the app within the bundle and marks the bundle as installed
-	 *
-	 * @param Bundle $bundle
-	 * @throws \Exception If app could not get installed
-	 */
-	public function installAppBundle(Bundle $bundle) {
-		$appIds = $bundle->getAppIdentifiers();
-		foreach ($appIds as $appId) {
-			if (!$this->isDownloaded($appId)) {
-				$this->downloadApp($appId);
-			}
-			$this->installApp($appId);
-			$app = new OC_App();
-			$app->enable($appId);
-		}
-		$bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
-		$bundles[] = $bundle->getIdentifier();
-		$this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
-	}
-
-	/**
-	 * Installs shipped apps
-	 *
-	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
-	 * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
-	 *                         working ownCloud at the end instead of an aborted update.
-	 * @return array Array of error messages (appid => Exception)
-	 */
-	public static function installShippedApps($softErrors = false) {
-		$appManager = \OC::$server->getAppManager();
-		$config = \OC::$server->getConfig();
-		$errors = [];
-		foreach (\OC::$APPSROOTS as $app_dir) {
-			if ($dir = opendir($app_dir['path'])) {
-				while (false !== ($filename = readdir($dir))) {
-					if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
-						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
-							if ($config->getAppValue($filename, "installed_version", null) === null) {
-								$info = OC_App::getAppInfo($filename);
-								$enabled = isset($info['default_enable']);
-								if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
-									  && $config->getAppValue($filename, 'enabled') !== 'no') {
-									if ($softErrors) {
-										try {
-											Installer::installShippedApp($filename);
-										} catch (HintException $e) {
-											if ($e->getPrevious() instanceof TableExistsException) {
-												$errors[$filename] = $e;
-												continue;
-											}
-											throw $e;
-										}
-									} else {
-										Installer::installShippedApp($filename);
-									}
-									$config->setAppValue($filename, 'enabled', 'yes');
-								}
-							}
-						}
-					}
-				}
-				closedir($dir);
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * install an app already placed in the app folder
-	 * @param string $app id of the app to install
-	 * @return integer
-	 */
-	public static function installShippedApp($app) {
-		//install the database
-		$appPath = OC_App::getAppPath($app);
-		\OC_App::registerAutoloading($app, $appPath);
-
-		$ms = new MigrationService($app, \OC::$server->get(Connection::class));
-		$ms->migrate('latest', true);
-
-		//run appinfo/install.php
-		self::includeAppScript("$appPath/appinfo/install.php");
-
-		$info = OC_App::getAppInfo($app);
-		if (is_null($info)) {
-			return false;
-		}
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
-
-		$config = \OC::$server->getConfig();
-
-		$config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
-		if (array_key_exists('ocsid', $info)) {
-			$config->setAppValue($app, 'ocsid', $info['ocsid']);
-		}
-
-		//set remote/public handlers
-		foreach ($info['remote'] as $name => $path) {
-			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
-		}
-		foreach ($info['public'] as $name => $path) {
-			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * @param string $script
-	 */
-	private static function includeAppScript($script) {
-		if (file_exists($script)) {
-			include $script;
-		}
-	}
+    /** @var AppFetcher */
+    private $appFetcher;
+    /** @var IClientService */
+    private $clientService;
+    /** @var ITempManager */
+    private $tempManager;
+    /** @var ILogger */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var array - for caching the result of app fetcher */
+    private $apps = null;
+    /** @var bool|null - for caching the result of the ready status */
+    private $isInstanceReadyForUpdates = null;
+    /** @var bool */
+    private $isCLI;
+
+    /**
+     * @param AppFetcher $appFetcher
+     * @param IClientService $clientService
+     * @param ITempManager $tempManager
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(
+        AppFetcher $appFetcher,
+        IClientService $clientService,
+        ITempManager $tempManager,
+        ILogger $logger,
+        IConfig $config,
+        bool $isCLI
+    ) {
+        $this->appFetcher = $appFetcher;
+        $this->clientService = $clientService;
+        $this->tempManager = $tempManager;
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->isCLI = $isCLI;
+    }
+
+    /**
+     * Installs an app that is located in one of the app folders already
+     *
+     * @param string $appId App to install
+     * @param bool $forceEnable
+     * @throws \Exception
+     * @return string app ID
+     */
+    public function installApp(string $appId, bool $forceEnable = false): string {
+        $app = \OC_App::findAppInDirectories($appId);
+        if ($app === false) {
+            throw new \Exception('App not found in any app directory');
+        }
+
+        $basedir = $app['path'].'/'.$appId;
+
+        if (is_file($basedir . '/appinfo/database.xml')) {
+            throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+        }
+
+        $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
+
+        $l = \OC::$server->getL10N('core');
+
+        if (!is_array($info)) {
+            throw new \Exception(
+                $l->t('App "%s" cannot be installed because appinfo file cannot be read.',
+                    [$appId]
+                )
+            );
+        }
+
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        $ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
+
+        $version = implode('.', \OCP\Util::getVersion());
+        if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {
+            throw new \Exception(
+                // TODO $l
+                $l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
+                    [$info['name']]
+                )
+            );
+        }
+
+        // check for required dependencies
+        \OC_App::checkAppDependencies($this->config, $l, $info, $ignoreMax);
+        /** @var Coordinator $coordinator */
+        $coordinator = \OC::$server->get(Coordinator::class);
+        $coordinator->runLazyRegistration($appId);
+        \OC_App::registerAutoloading($appId, $basedir);
+
+        $previousVersion = $this->config->getAppValue($info['id'], 'installed_version', false);
+        if ($previousVersion) {
+            OC_App::executeRepairSteps($appId, $info['repair-steps']['pre-migration']);
+        }
+
+        //install the database
+        $ms = new MigrationService($info['id'], \OC::$server->get(Connection::class));
+        $ms->migrate('latest', true);
+
+        if ($previousVersion) {
+            OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
+        }
+
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        //run appinfo/install.php
+        self::includeAppScript($basedir . '/appinfo/install.php');
+
+        $appData = OC_App::getAppInfo($appId);
+        OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
+
+        //set the installed version
+        \OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
+        \OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
+
+        //set remote/public handlers
+        foreach ($info['remote'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
+        }
+        foreach ($info['public'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * Updates the specified app from the appstore
+     *
+     * @param string $appId
+     * @param bool [$allowUnstable] Allow unstable releases
+     * @return bool
+     */
+    public function updateAppstoreApp($appId, $allowUnstable = false) {
+        if ($this->isUpdateAvailable($appId, $allowUnstable)) {
+            try {
+                $this->downloadApp($appId, $allowUnstable);
+            } catch (\Exception $e) {
+                $this->logger->logException($e, [
+                    'level' => ILogger::ERROR,
+                    'app' => 'core',
+                ]);
+                return false;
+            }
+            return OC_App::updateApp($appId);
+        }
+
+        return false;
+    }
+
+    /**
+     * Split the certificate file in individual certs
+     *
+     * @param string $cert
+     * @return string[]
+     */
+    private function splitCerts(string $cert): array {
+        preg_match_all('([\-]{3,}[\S\ ]+?[\-]{3,}[\S\s]+?[\-]{3,}[\S\ ]+?[\-]{3,})', $cert, $matches);
+
+        return $matches[0];
+    }
+
+    /**
+     * Downloads an app and puts it into the app directory
+     *
+     * @param string $appId
+     * @param bool [$allowUnstable]
+     *
+     * @throws \Exception If the installation was not successful
+     */
+    public function downloadApp($appId, $allowUnstable = false) {
+        $appId = strtolower($appId);
+
+        $apps = $this->appFetcher->get($allowUnstable);
+        foreach ($apps as $app) {
+            if ($app['id'] === $appId) {
+                // Load the certificate
+                $certificate = new X509();
+                $rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+                $rootCrts = $this->splitCerts($rootCrt);
+                foreach ($rootCrts as $rootCrt) {
+                    $certificate->loadCA($rootCrt);
+                }
+                $loadedCertificate = $certificate->loadX509($app['certificate']);
+
+                // Verify if the certificate has been revoked
+                $crl = new X509();
+                foreach ($rootCrts as $rootCrt) {
+                    $crl->loadCA($rootCrt);
+                }
+                $crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+                if ($crl->validateSignature() !== true) {
+                    throw new \Exception('Could not validate CRL signature');
+                }
+                $csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
+                $revoked = $crl->getRevoked($csn);
+                if ($revoked !== false) {
+                    throw new \Exception(
+                        sprintf(
+                            'Certificate "%s" has been revoked',
+                            $csn
+                        )
+                    );
+                }
+
+                // Verify if the certificate has been issued by the Nextcloud Code Authority CA
+                if ($certificate->validateSignature() !== true) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a certificate not issued by a trusted Code Signing Authority',
+                            $appId
+                        )
+                    );
+                }
+
+                // Verify if the certificate is issued for the requested app id
+                $certInfo = openssl_x509_parse($app['certificate']);
+                if (!isset($certInfo['subject']['CN'])) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert with no CN',
+                            $appId
+                        )
+                    );
+                }
+                if ($certInfo['subject']['CN'] !== $appId) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert issued to %s',
+                            $appId,
+                            $certInfo['subject']['CN']
+                        )
+                    );
+                }
+
+                // Download the release
+                $tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
+                $timeout = $this->isCLI ? 0 : 120;
+                $client = $this->clientService->newClient();
+                $client->get($app['releases'][0]['download'], ['sink' => $tempFile, 'timeout' => $timeout]);
+
+                // Check if the signature actually matches the downloaded content
+                $certificate = openssl_get_publickey($app['certificate']);
+                $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+                openssl_free_key($certificate);
+
+                if ($verified === true) {
+                    // Seems to match, let's proceed
+                    $extractDir = $this->tempManager->getTemporaryFolder();
+                    $archive = new TAR($tempFile);
+
+                    if ($archive) {
+                        if (!$archive->extract($extractDir)) {
+                            $errorMessage = 'Could not extract app ' . $appId;
+
+                            $archiveError = $archive->getError();
+                            if ($archiveError instanceof \PEAR_Error) {
+                                $errorMessage .= ': ' . $archiveError->getMessage();
+                            }
+
+                            throw new \Exception($errorMessage);
+                        }
+                        $allFiles = scandir($extractDir);
+                        $folders = array_diff($allFiles, ['.', '..']);
+                        $folders = array_values($folders);
+
+                        if (count($folders) > 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'Extracted app %s has more than 1 folder',
+                                    $appId
+                                )
+                            );
+                        }
+
+                        // Check if appinfo/info.xml has the same app ID as well
+                        $loadEntities = libxml_disable_entity_loader(false);
+                        $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+                        libxml_disable_entity_loader($loadEntities);
+                        if ((string)$xml->id !== $appId) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has a wrong app ID in info.xml: %s',
+                                    $appId,
+                                    (string)$xml->id
+                                )
+                            );
+                        }
+
+                        // Check if the version is lower than before
+                        $currentVersion = OC_App::getAppVersion($appId);
+                        $newVersion = (string)$xml->version;
+                        if (version_compare($currentVersion, $newVersion) === 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has version %s and tried to update to lower version %s',
+                                    $appId,
+                                    $currentVersion,
+                                    $newVersion
+                                )
+                            );
+                        }
+
+                        $baseDir = OC_App::getInstallPath() . '/' . $appId;
+                        // Remove old app with the ID if existent
+                        OC_Helper::rmdirr($baseDir);
+                        // Move to app folder
+                        if (@mkdir($baseDir)) {
+                            $extractDir .= '/' . $folders[0];
+                            OC_Helper::copyr($extractDir, $baseDir);
+                        }
+                        OC_Helper::copyr($extractDir, $baseDir);
+                        OC_Helper::rmdirr($extractDir);
+                        return;
+                    } else {
+                        throw new \Exception(
+                            sprintf(
+                                'Could not extract app with ID %s to %s',
+                                $appId,
+                                $extractDir
+                            )
+                        );
+                    }
+                } else {
+                    // Signature does not match
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has invalid signature',
+                            $appId
+                        )
+                    );
+                }
+            }
+        }
+
+        throw new \Exception(
+            sprintf(
+                'Could not download app %s',
+                $appId
+            )
+        );
+    }
+
+    /**
+     * Check if an update for the app is available
+     *
+     * @param string $appId
+     * @param bool $allowUnstable
+     * @return string|false false or the version number of the update
+     */
+    public function isUpdateAvailable($appId, $allowUnstable = false) {
+        if ($this->isInstanceReadyForUpdates === null) {
+            $installPath = OC_App::getInstallPath();
+            if ($installPath === false || $installPath === null) {
+                $this->isInstanceReadyForUpdates = false;
+            } else {
+                $this->isInstanceReadyForUpdates = true;
+            }
+        }
+
+        if ($this->isInstanceReadyForUpdates === false) {
+            return false;
+        }
+
+        if ($this->isInstalledFromGit($appId) === true) {
+            return false;
+        }
+
+        if ($this->apps === null) {
+            $this->apps = $this->appFetcher->get($allowUnstable);
+        }
+
+        foreach ($this->apps as $app) {
+            if ($app['id'] === $appId) {
+                $currentVersion = OC_App::getAppVersion($appId);
+
+                if (!isset($app['releases'][0]['version'])) {
+                    return false;
+                }
+                $newestVersion = $app['releases'][0]['version'];
+                if ($currentVersion !== '0' && version_compare($newestVersion, $currentVersion, '>')) {
+                    return $newestVersion;
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if app has been installed from git
+     * @param string $name name of the application to remove
+     * @return boolean
+     *
+     * The function will check if the path contains a .git folder
+     */
+    private function isInstalledFromGit($appId) {
+        $app = \OC_App::findAppInDirectories($appId);
+        if ($app === false) {
+            return false;
+        }
+        $basedir = $app['path'].'/'.$appId;
+        return file_exists($basedir.'/.git/');
+    }
+
+    /**
+     * Check if app is already downloaded
+     * @param string $name name of the application to remove
+     * @return boolean
+     *
+     * The function will check if the app is already downloaded in the apps repository
+     */
+    public function isDownloaded($name) {
+        foreach (\OC::$APPSROOTS as $dir) {
+            $dirToTest = $dir['path'];
+            $dirToTest .= '/';
+            $dirToTest .= $name;
+            $dirToTest .= '/';
+
+            if (is_dir($dirToTest)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes an app
+     * @param string $appId ID of the application to remove
+     * @return boolean
+     *
+     *
+     * This function works as follows
+     *   -# call uninstall repair steps
+     *   -# removing the files
+     *
+     * The function will not delete preferences, tables and the configuration,
+     * this has to be done by the function oc_app_uninstall().
+     */
+    public function removeApp($appId) {
+        if ($this->isDownloaded($appId)) {
+            if (\OC::$server->getAppManager()->isShipped($appId)) {
+                return false;
+            }
+            $appDir = OC_App::getInstallPath() . '/' . $appId;
+            OC_Helper::rmdirr($appDir);
+            return true;
+        } else {
+            \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR);
+
+            return false;
+        }
+    }
+
+    /**
+     * Installs the app within the bundle and marks the bundle as installed
+     *
+     * @param Bundle $bundle
+     * @throws \Exception If app could not get installed
+     */
+    public function installAppBundle(Bundle $bundle) {
+        $appIds = $bundle->getAppIdentifiers();
+        foreach ($appIds as $appId) {
+            if (!$this->isDownloaded($appId)) {
+                $this->downloadApp($appId);
+            }
+            $this->installApp($appId);
+            $app = new OC_App();
+            $app->enable($appId);
+        }
+        $bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
+        $bundles[] = $bundle->getIdentifier();
+        $this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
+    }
+
+    /**
+     * Installs shipped apps
+     *
+     * This function installs all apps found in the 'apps' directory that should be enabled by default;
+     * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
+     *                         working ownCloud at the end instead of an aborted update.
+     * @return array Array of error messages (appid => Exception)
+     */
+    public static function installShippedApps($softErrors = false) {
+        $appManager = \OC::$server->getAppManager();
+        $config = \OC::$server->getConfig();
+        $errors = [];
+        foreach (\OC::$APPSROOTS as $app_dir) {
+            if ($dir = opendir($app_dir['path'])) {
+                while (false !== ($filename = readdir($dir))) {
+                    if ($filename[0] !== '.' and is_dir($app_dir['path']."/$filename")) {
+                        if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
+                            if ($config->getAppValue($filename, "installed_version", null) === null) {
+                                $info = OC_App::getAppInfo($filename);
+                                $enabled = isset($info['default_enable']);
+                                if (($enabled || in_array($filename, $appManager->getAlwaysEnabledApps()))
+                                      && $config->getAppValue($filename, 'enabled') !== 'no') {
+                                    if ($softErrors) {
+                                        try {
+                                            Installer::installShippedApp($filename);
+                                        } catch (HintException $e) {
+                                            if ($e->getPrevious() instanceof TableExistsException) {
+                                                $errors[$filename] = $e;
+                                                continue;
+                                            }
+                                            throw $e;
+                                        }
+                                    } else {
+                                        Installer::installShippedApp($filename);
+                                    }
+                                    $config->setAppValue($filename, 'enabled', 'yes');
+                                }
+                            }
+                        }
+                    }
+                }
+                closedir($dir);
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * install an app already placed in the app folder
+     * @param string $app id of the app to install
+     * @return integer
+     */
+    public static function installShippedApp($app) {
+        //install the database
+        $appPath = OC_App::getAppPath($app);
+        \OC_App::registerAutoloading($app, $appPath);
+
+        $ms = new MigrationService($app, \OC::$server->get(Connection::class));
+        $ms->migrate('latest', true);
+
+        //run appinfo/install.php
+        self::includeAppScript("$appPath/appinfo/install.php");
+
+        $info = OC_App::getAppInfo($app);
+        if (is_null($info)) {
+            return false;
+        }
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
+
+        $config = \OC::$server->getConfig();
+
+        $config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
+        if (array_key_exists('ocsid', $info)) {
+            $config->setAppValue($app, 'ocsid', $info['ocsid']);
+        }
+
+        //set remote/public handlers
+        foreach ($info['remote'] as $name => $path) {
+            $config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
+        }
+        foreach ($info['public'] as $name => $path) {
+            $config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * @param string $script
+     */
+    private static function includeAppScript($script) {
+        if (file_exists($script)) {
+            include $script;
+        }
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -115,8 +115,8 @@ 
 
 		$basedir = $app['path'].'/'.$appId;
 
-		if (is_file($basedir . '/appinfo/database.xml')) {
-			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+		if (is_file($basedir.'/appinfo/database.xml')) {
+			throw new \Exception('The appinfo/database.xml file is not longer supported. Used in '.$appId);
 		}
 
 		$info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
@@ -167,7 +167,7 @@ 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
 
 		//run appinfo/install.php
-		self::includeAppScript($basedir . '/appinfo/install.php');
+		self::includeAppScript($basedir.'/appinfo/install.php');
 
 		$appData = OC_App::getAppInfo($appId);
 		OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
@@ -241,7 +241,7 @@ 
 			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$rootCrt = file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt');
+				$rootCrt = file_get_contents(__DIR__.'/../../resources/codesigning/root.crt');
 				$rootCrts = $this->splitCerts($rootCrt);
 				foreach ($rootCrts as $rootCrt) {
 					$certificate->loadCA($rootCrt);
@@ -253,7 +253,7 @@ 
 				foreach ($rootCrts as $rootCrt) {
 					$crl->loadCA($rootCrt);
 				}
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
 				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
@@ -306,7 +306,7 @@ 
 
 				// Check if the signature actually matches the downloaded content
 				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+				$verified = (bool) openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
 				openssl_free_key($certificate);
 
 				if ($verified === true) {
@@ -316,11 +316,11 @@ 
 
 					if ($archive) {
 						if (!$archive->extract($extractDir)) {
-							$errorMessage = 'Could not extract app ' . $appId;
+							$errorMessage = 'Could not extract app '.$appId;
 
 							$archiveError = $archive->getError();
 							if ($archiveError instanceof \PEAR_Error) {
-								$errorMessage .= ': ' . $archiveError->getMessage();
+								$errorMessage .= ': '.$archiveError->getMessage();
 							}
 
 							throw new \Exception($errorMessage);
@@ -340,21 +340,21 @@ 
 
 						// Check if appinfo/info.xml has the same app ID as well
 						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+						$xml = simplexml_load_file($extractDir.'/'.$folders[0].'/appinfo/info.xml');
 						libxml_disable_entity_loader($loadEntities);
-						if ((string)$xml->id !== $appId) {
+						if ((string) $xml->id !== $appId) {
 							throw new \Exception(
 								sprintf(
 									'App for id %s has a wrong app ID in info.xml: %s',
 									$appId,
-									(string)$xml->id
+									(string) $xml->id
 								)
 							);
 						}
 
 						// Check if the version is lower than before
 						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
+						$newVersion = (string) $xml->version;
 						if (version_compare($currentVersion, $newVersion) === 1) {
 							throw new \Exception(
 								sprintf(
@@ -366,12 +366,12 @@ 
 							);
 						}
 
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
+						$baseDir = OC_App::getInstallPath().'/'.$appId;
 						// Remove old app with the ID if existent
 						OC_Helper::rmdirr($baseDir);
 						// Move to app folder
 						if (@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
+							$extractDir .= '/'.$folders[0];
 							OC_Helper::copyr($extractDir, $baseDir);
 						}
 						OC_Helper::copyr($extractDir, $baseDir);
@@ -510,7 +510,7 @@ 
 			if (\OC::$server->getAppManager()->isShipped($appId)) {
 				return false;
 			}
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
+			$appDir = OC_App::getInstallPath().'/'.$appId;
 			OC_Helper::rmdirr($appDir);
 			return true;
 		} else {

lib/private/DB/Connection.php

Indentation +489 added lines, -489 removed lines

@@ -57,493 +57,493 @@
 use OCP\PreConditionNotMetException;
 
 class Connection extends \Doctrine\DBAL\Connection {
-	/** @var string */
-	protected $tablePrefix;
-
-	/** @var \OC\DB\Adapter $adapter */
-	protected $adapter;
-
-	/** @var SystemConfig */
-	private $systemConfig;
-
-	/** @var ILogger */
-	private $logger;
-
-	protected $lockedTable = null;
-
-	/** @var int */
-	protected $queriesBuilt = 0;
-
-	/** @var int */
-	protected $queriesExecuted = 0;
-
-	/**
-	 * @throws Exception
-	 */
-	public function connect() {
-		try {
-			return parent::connect();
-		} catch (Exception $e) {
-			// throw a new exception to prevent leaking info from the stacktrace
-			throw new Exception('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
-		}
-	}
-
-	public function getStats(): array {
-		return [
-			'built' => $this->queriesBuilt,
-			'executed' => $this->queriesExecuted,
-		];
-	}
-
-	/**
-	 * Returns a QueryBuilder for the connection.
-	 */
-	public function getQueryBuilder(): IQueryBuilder {
-		$this->queriesBuilt++;
-		return new QueryBuilder(
-			new ConnectionAdapter($this),
-			$this->systemConfig,
-			$this->logger
-		);
-	}
-
-	/**
-	 * Gets the QueryBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\QueryBuilder
-	 * @deprecated please use $this->getQueryBuilder() instead
-	 */
-	public function createQueryBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		$this->queriesBuilt++;
-		return parent::createQueryBuilder();
-	}
-
-	/**
-	 * Gets the ExpressionBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
-	 * @deprecated please use $this->getQueryBuilder()->expr() instead
-	 */
-	public function getExpressionBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		$this->queriesBuilt++;
-		return parent::getExpressionBuilder();
-	}
-
-	/**
-	 * Get the file and line that called the method where `getCallerBacktrace()` was used
-	 *
-	 * @return string
-	 */
-	protected function getCallerBacktrace() {
-		$traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-
-		// 0 is the method where we use `getCallerBacktrace`
-		// 1 is the target method which uses the method we want to log
-		if (isset($traces[1])) {
-			return $traces[1]['file'] . ':' . $traces[1]['line'];
-		}
-
-		return '';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrefix() {
-		return $this->tablePrefix;
-	}
-
-	/**
-	 * Initializes a new instance of the Connection class.
-	 *
-	 * @param array $params  The connection parameters.
-	 * @param \Doctrine\DBAL\Driver $driver
-	 * @param \Doctrine\DBAL\Configuration $config
-	 * @param \Doctrine\Common\EventManager $eventManager
-	 * @throws \Exception
-	 */
-	public function __construct(array $params, Driver $driver, Configuration $config = null,
-		EventManager $eventManager = null) {
-		if (!isset($params['adapter'])) {
-			throw new \Exception('adapter not set');
-		}
-		if (!isset($params['tablePrefix'])) {
-			throw new \Exception('tablePrefix not set');
-		}
-		/**
-		 * @psalm-suppress InternalMethod
-		 */
-		parent::__construct($params, $driver, $config, $eventManager);
-		$this->adapter = new $params['adapter']($this);
-		$this->tablePrefix = $params['tablePrefix'];
-
-		$this->systemConfig = \OC::$server->getSystemConfig();
-		$this->logger = \OC::$server->getLogger();
-	}
-
-	/**
-	 * Prepares an SQL statement.
-	 *
-	 * @param string $statement The SQL statement to prepare.
-	 * @param int $limit
-	 * @param int $offset
-	 *
-	 * @return Statement The prepared statement.
-	 * @throws Exception
-	 */
-	public function prepare($statement, $limit = null, $offset = null): Statement {
-		if ($limit === -1) {
-			$limit = null;
-		}
-		if (!is_null($limit)) {
-			$platform = $this->getDatabasePlatform();
-			$statement = $platform->modifyLimitQuery($statement, $limit, $offset);
-		}
-		$statement = $this->replaceTablePrefix($statement);
-		$statement = $this->adapter->fixupStatement($statement);
-
-		return parent::prepare($statement);
-	}
-
-	/**
-	 * Executes an, optionally parametrized, SQL query.
-	 *
-	 * If the query is parametrized, a prepared statement is used.
-	 * If an SQLLogger is configured, the execution is logged.
-	 *
-	 * @param string                                      $sql  The SQL query to execute.
-	 * @param array                                       $params The parameters to bind to the query, if any.
-	 * @param array                                       $types  The types the previous parameters are in.
-	 * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
-	 *
-	 * @return Result The executed statement.
-	 *
-	 * @throws \Doctrine\DBAL\Exception
-	 */
-	public function executeQuery(string $sql, array $params = [], $types = [], QueryCacheProfile $qcp = null): Result {
-		$sql = $this->replaceTablePrefix($sql);
-		$sql = $this->adapter->fixupStatement($sql);
-		$this->queriesExecuted++;
-		return parent::executeQuery($sql, $params, $types, $qcp);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function executeUpdate(string $sql, array $params = [], array $types = []): int {
-		$sql = $this->replaceTablePrefix($sql);
-		$sql = $this->adapter->fixupStatement($sql);
-		$this->queriesExecuted++;
-		return parent::executeUpdate($sql, $params, $types);
-	}
-
-	/**
-	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
-	 * and returns the number of affected rows.
-	 *
-	 * This method supports PDO binding types as well as DBAL mapping types.
-	 *
-	 * @param string $sql  The SQL query.
-	 * @param array  $params The query parameters.
-	 * @param array  $types  The parameter types.
-	 *
-	 * @return int The number of affected rows.
-	 *
-	 * @throws \Doctrine\DBAL\Exception
-	 */
-	public function executeStatement($sql, array $params = [], array $types = []): int {
-		$sql = $this->replaceTablePrefix($sql);
-		$sql = $this->adapter->fixupStatement($sql);
-		$this->queriesExecuted++;
-		return parent::executeStatement($sql, $params, $types);
-	}
-
-	/**
-	 * Returns the ID of the last inserted row, or the last value from a sequence object,
-	 * depending on the underlying driver.
-	 *
-	 * Note: This method may not return a meaningful or consistent result across different drivers,
-	 * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
-	 * columns or sequences.
-	 *
-	 * @param string $seqName Name of the sequence object from which the ID should be returned.
-	 *
-	 * @return string the last inserted ID.
-	 * @throws Exception
-	 */
-	public function lastInsertId($seqName = null) {
-		if ($seqName) {
-			$seqName = $this->replaceTablePrefix($seqName);
-		}
-		return $this->adapter->lastInsertId($seqName);
-	}
-
-	/**
-	 * @internal
-	 * @throws Exception
-	 */
-	public function realLastInsertId($seqName = null) {
-		return parent::lastInsertId($seqName);
-	}
-
-	/**
-	 * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
-	 * it is needed that there is also a unique constraint on the values. Then this method will
-	 * catch the exception and return 0.
-	 *
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
-	 * @param array|null $compare List of values that should be checked for "if not exists"
-	 *				If this is null or an empty array, all keys of $input will be compared
-	 *				Please note: text fields (clob) must not be used in the compare array
-	 * @return int number of inserted rows
-	 * @throws \Doctrine\DBAL\Exception
-	 * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null) {
-		return $this->adapter->insertIfNotExist($table, $input, $compare);
-	}
-
-	public function insertIgnoreConflict(string $table, array $values) : int {
-		return $this->adapter->insertIgnoreConflict($table, $values);
-	}
-
-	private function getType($value) {
-		if (is_bool($value)) {
-			return IQueryBuilder::PARAM_BOOL;
-		} elseif (is_int($value)) {
-			return IQueryBuilder::PARAM_INT;
-		} else {
-			return IQueryBuilder::PARAM_STR;
-		}
-	}
-
-	/**
-	 * Insert or update a row value
-	 *
-	 * @param string $table
-	 * @param array $keys (column name => value)
-	 * @param array $values (column name => value)
-	 * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
-	 * @return int number of new rows
-	 * @throws \Doctrine\DBAL\Exception
-	 * @throws PreConditionNotMetException
-	 */
-	public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
-		try {
-			$insertQb = $this->getQueryBuilder();
-			$insertQb->insert($table)
-				->values(
-					array_map(function ($value) use ($insertQb) {
-						return $insertQb->createNamedParameter($value, $this->getType($value));
-					}, array_merge($keys, $values))
-				);
-			return $insertQb->execute();
-		} catch (NotNullConstraintViolationException $e) {
-			throw $e;
-		} catch (ConstraintViolationException $e) {
-			// value already exists, try update
-			$updateQb = $this->getQueryBuilder();
-			$updateQb->update($table);
-			foreach ($values as $name => $value) {
-				$updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
-			}
-			$where = $updateQb->expr()->andX();
-			$whereValues = array_merge($keys, $updatePreconditionValues);
-			foreach ($whereValues as $name => $value) {
-				if ($value === '') {
-					$where->add($updateQb->expr()->emptyString(
-						$name
-					));
-				} else {
-					$where->add($updateQb->expr()->eq(
-						$name,
-						$updateQb->createNamedParameter($value, $this->getType($value)),
-						$this->getType($value)
-					));
-				}
-			}
-			$updateQb->where($where);
-			$affected = $updateQb->execute();
-
-			if ($affected === 0 && !empty($updatePreconditionValues)) {
-				throw new PreConditionNotMetException();
-			}
-
-			return 0;
-		}
-	}
-
-	/**
-	 * Create an exclusive read+write lock on a table
-	 *
-	 * @param string $tableName
-	 *
-	 * @throws \BadMethodCallException When trying to acquire a second lock
-	 * @throws Exception
-	 * @since 9.1.0
-	 */
-	public function lockTable($tableName) {
-		if ($this->lockedTable !== null) {
-			throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
-		}
-
-		$tableName = $this->tablePrefix . $tableName;
-		$this->lockedTable = $tableName;
-		$this->adapter->lockTable($tableName);
-	}
-
-	/**
-	 * Release a previous acquired lock again
-	 *
-	 * @throws Exception
-	 * @since 9.1.0
-	 */
-	public function unlockTable() {
-		$this->adapter->unlockTable();
-		$this->lockedTable = null;
-	}
-
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 */
-	public function getError() {
-		$msg = $this->errorCode() . ': ';
-		$errorInfo = $this->errorInfo();
-		if (!empty($errorInfo)) {
-			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
-			$msg .= 'Driver Message = '.$errorInfo[2];
-		}
-		return $msg;
-	}
-
-	public function errorCode() {
-		return -1;
-	}
-
-	public function errorInfo() {
-		return [];
-	}
-
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 *
-	 * @throws Exception
-	 */
-	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		if ($schema->tablesExist([$table])) {
-			$schema->dropTable($table);
-		}
-	}
-
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 *
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function tableExists($table) {
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		return $schema->tablesExist([$table]);
-	}
-
-	// internal use
-	/**
-	 * @param string $statement
-	 * @return string
-	 */
-	protected function replaceTablePrefix($statement) {
-		return str_replace('*PREFIX*', $this->tablePrefix, $statement);
-	}
-
-	/**
-	 * Check if a transaction is active
-	 *
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function inTransaction() {
-		return $this->getTransactionNestingLevel() > 0;
-	}
-
-	/**
-	 * Escape a parameter to be used in a LIKE query
-	 *
-	 * @param string $param
-	 * @return string
-	 */
-	public function escapeLikeParameter($param) {
-		return addcslashes($param, '\\_%');
-	}
-
-	/**
-	 * Check whether or not the current database support 4byte wide unicode
-	 *
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function supports4ByteText() {
-		if (!$this->getDatabasePlatform() instanceof MySQLPlatform) {
-			return true;
-		}
-		return $this->getParams()['charset'] === 'utf8mb4';
-	}
-
-
-	/**
-	 * Create the schema of the connected database
-	 *
-	 * @return Schema
-	 * @throws Exception
-	 */
-	public function createSchema() {
-		$migrator = $this->getMigrator();
-		return $migrator->createSchema();
-	}
-
-	/**
-	 * Migrate the database to the given schema
-	 *
-	 * @param Schema $toSchema
-	 *
-	 * @throws Exception
-	 */
-	public function migrateToSchema(Schema $toSchema) {
-		$migrator = $this->getMigrator();
-		$migrator->migrate($toSchema);
-	}
-
-	private function getMigrator() {
-		// TODO properly inject those dependencies
-		$random = \OC::$server->getSecureRandom();
-		$platform = $this->getDatabasePlatform();
-		$config = \OC::$server->getConfig();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		if ($platform instanceof SqlitePlatform) {
-			return new SQLiteMigrator($this, $config, $dispatcher);
-		} elseif ($platform instanceof OraclePlatform) {
-			return new OracleMigrator($this, $config, $dispatcher);
-		} elseif ($platform instanceof MySQLPlatform) {
-			return new MySQLMigrator($this, $config, $dispatcher);
-		} elseif ($platform instanceof PostgreSQL94Platform) {
-			return new PostgreSqlMigrator($this, $config, $dispatcher);
-		} else {
-			return new Migrator($this, $config, $dispatcher);
-		}
-	}
+    /** @var string */
+    protected $tablePrefix;
+
+    /** @var \OC\DB\Adapter $adapter */
+    protected $adapter;
+
+    /** @var SystemConfig */
+    private $systemConfig;
+
+    /** @var ILogger */
+    private $logger;
+
+    protected $lockedTable = null;
+
+    /** @var int */
+    protected $queriesBuilt = 0;
+
+    /** @var int */
+    protected $queriesExecuted = 0;
+
+    /**
+     * @throws Exception
+     */
+    public function connect() {
+        try {
+            return parent::connect();
+        } catch (Exception $e) {
+            // throw a new exception to prevent leaking info from the stacktrace
+            throw new Exception('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
+        }
+    }
+
+    public function getStats(): array {
+        return [
+            'built' => $this->queriesBuilt,
+            'executed' => $this->queriesExecuted,
+        ];
+    }
+
+    /**
+     * Returns a QueryBuilder for the connection.
+     */
+    public function getQueryBuilder(): IQueryBuilder {
+        $this->queriesBuilt++;
+        return new QueryBuilder(
+            new ConnectionAdapter($this),
+            $this->systemConfig,
+            $this->logger
+        );
+    }
+
+    /**
+     * Gets the QueryBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\QueryBuilder
+     * @deprecated please use $this->getQueryBuilder() instead
+     */
+    public function createQueryBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        $this->queriesBuilt++;
+        return parent::createQueryBuilder();
+    }
+
+    /**
+     * Gets the ExpressionBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
+     * @deprecated please use $this->getQueryBuilder()->expr() instead
+     */
+    public function getExpressionBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        $this->queriesBuilt++;
+        return parent::getExpressionBuilder();
+    }
+
+    /**
+     * Get the file and line that called the method where `getCallerBacktrace()` was used
+     *
+     * @return string
+     */
+    protected function getCallerBacktrace() {
+        $traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+        // 0 is the method where we use `getCallerBacktrace`
+        // 1 is the target method which uses the method we want to log
+        if (isset($traces[1])) {
+            return $traces[1]['file'] . ':' . $traces[1]['line'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix() {
+        return $this->tablePrefix;
+    }
+
+    /**
+     * Initializes a new instance of the Connection class.
+     *
+     * @param array $params  The connection parameters.
+     * @param \Doctrine\DBAL\Driver $driver
+     * @param \Doctrine\DBAL\Configuration $config
+     * @param \Doctrine\Common\EventManager $eventManager
+     * @throws \Exception
+     */
+    public function __construct(array $params, Driver $driver, Configuration $config = null,
+        EventManager $eventManager = null) {
+        if (!isset($params['adapter'])) {
+            throw new \Exception('adapter not set');
+        }
+        if (!isset($params['tablePrefix'])) {
+            throw new \Exception('tablePrefix not set');
+        }
+        /**
+         * @psalm-suppress InternalMethod
+         */
+        parent::__construct($params, $driver, $config, $eventManager);
+        $this->adapter = new $params['adapter']($this);
+        $this->tablePrefix = $params['tablePrefix'];
+
+        $this->systemConfig = \OC::$server->getSystemConfig();
+        $this->logger = \OC::$server->getLogger();
+    }
+
+    /**
+     * Prepares an SQL statement.
+     *
+     * @param string $statement The SQL statement to prepare.
+     * @param int $limit
+     * @param int $offset
+     *
+     * @return Statement The prepared statement.
+     * @throws Exception
+     */
+    public function prepare($statement, $limit = null, $offset = null): Statement {
+        if ($limit === -1) {
+            $limit = null;
+        }
+        if (!is_null($limit)) {
+            $platform = $this->getDatabasePlatform();
+            $statement = $platform->modifyLimitQuery($statement, $limit, $offset);
+        }
+        $statement = $this->replaceTablePrefix($statement);
+        $statement = $this->adapter->fixupStatement($statement);
+
+        return parent::prepare($statement);
+    }
+
+    /**
+     * Executes an, optionally parametrized, SQL query.
+     *
+     * If the query is parametrized, a prepared statement is used.
+     * If an SQLLogger is configured, the execution is logged.
+     *
+     * @param string                                      $sql  The SQL query to execute.
+     * @param array                                       $params The parameters to bind to the query, if any.
+     * @param array                                       $types  The types the previous parameters are in.
+     * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
+     *
+     * @return Result The executed statement.
+     *
+     * @throws \Doctrine\DBAL\Exception
+     */
+    public function executeQuery(string $sql, array $params = [], $types = [], QueryCacheProfile $qcp = null): Result {
+        $sql = $this->replaceTablePrefix($sql);
+        $sql = $this->adapter->fixupStatement($sql);
+        $this->queriesExecuted++;
+        return parent::executeQuery($sql, $params, $types, $qcp);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function executeUpdate(string $sql, array $params = [], array $types = []): int {
+        $sql = $this->replaceTablePrefix($sql);
+        $sql = $this->adapter->fixupStatement($sql);
+        $this->queriesExecuted++;
+        return parent::executeUpdate($sql, $params, $types);
+    }
+
+    /**
+     * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+     * and returns the number of affected rows.
+     *
+     * This method supports PDO binding types as well as DBAL mapping types.
+     *
+     * @param string $sql  The SQL query.
+     * @param array  $params The query parameters.
+     * @param array  $types  The parameter types.
+     *
+     * @return int The number of affected rows.
+     *
+     * @throws \Doctrine\DBAL\Exception
+     */
+    public function executeStatement($sql, array $params = [], array $types = []): int {
+        $sql = $this->replaceTablePrefix($sql);
+        $sql = $this->adapter->fixupStatement($sql);
+        $this->queriesExecuted++;
+        return parent::executeStatement($sql, $params, $types);
+    }
+
+    /**
+     * Returns the ID of the last inserted row, or the last value from a sequence object,
+     * depending on the underlying driver.
+     *
+     * Note: This method may not return a meaningful or consistent result across different drivers,
+     * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
+     * columns or sequences.
+     *
+     * @param string $seqName Name of the sequence object from which the ID should be returned.
+     *
+     * @return string the last inserted ID.
+     * @throws Exception
+     */
+    public function lastInsertId($seqName = null) {
+        if ($seqName) {
+            $seqName = $this->replaceTablePrefix($seqName);
+        }
+        return $this->adapter->lastInsertId($seqName);
+    }
+
+    /**
+     * @internal
+     * @throws Exception
+     */
+    public function realLastInsertId($seqName = null) {
+        return parent::lastInsertId($seqName);
+    }
+
+    /**
+     * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
+     * it is needed that there is also a unique constraint on the values. Then this method will
+     * catch the exception and return 0.
+     *
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
+     * @param array $input data that should be inserted into the table  (column name => value)
+     * @param array|null $compare List of values that should be checked for "if not exists"
+     *				If this is null or an empty array, all keys of $input will be compared
+     *				Please note: text fields (clob) must not be used in the compare array
+     * @return int number of inserted rows
+     * @throws \Doctrine\DBAL\Exception
+     * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
+     */
+    public function insertIfNotExist($table, $input, array $compare = null) {
+        return $this->adapter->insertIfNotExist($table, $input, $compare);
+    }
+
+    public function insertIgnoreConflict(string $table, array $values) : int {
+        return $this->adapter->insertIgnoreConflict($table, $values);
+    }
+
+    private function getType($value) {
+        if (is_bool($value)) {
+            return IQueryBuilder::PARAM_BOOL;
+        } elseif (is_int($value)) {
+            return IQueryBuilder::PARAM_INT;
+        } else {
+            return IQueryBuilder::PARAM_STR;
+        }
+    }
+
+    /**
+     * Insert or update a row value
+     *
+     * @param string $table
+     * @param array $keys (column name => value)
+     * @param array $values (column name => value)
+     * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
+     * @return int number of new rows
+     * @throws \Doctrine\DBAL\Exception
+     * @throws PreConditionNotMetException
+     */
+    public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
+        try {
+            $insertQb = $this->getQueryBuilder();
+            $insertQb->insert($table)
+                ->values(
+                    array_map(function ($value) use ($insertQb) {
+                        return $insertQb->createNamedParameter($value, $this->getType($value));
+                    }, array_merge($keys, $values))
+                );
+            return $insertQb->execute();
+        } catch (NotNullConstraintViolationException $e) {
+            throw $e;
+        } catch (ConstraintViolationException $e) {
+            // value already exists, try update
+            $updateQb = $this->getQueryBuilder();
+            $updateQb->update($table);
+            foreach ($values as $name => $value) {
+                $updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
+            }
+            $where = $updateQb->expr()->andX();
+            $whereValues = array_merge($keys, $updatePreconditionValues);
+            foreach ($whereValues as $name => $value) {
+                if ($value === '') {
+                    $where->add($updateQb->expr()->emptyString(
+                        $name
+                    ));
+                } else {
+                    $where->add($updateQb->expr()->eq(
+                        $name,
+                        $updateQb->createNamedParameter($value, $this->getType($value)),
+                        $this->getType($value)
+                    ));
+                }
+            }
+            $updateQb->where($where);
+            $affected = $updateQb->execute();
+
+            if ($affected === 0 && !empty($updatePreconditionValues)) {
+                throw new PreConditionNotMetException();
+            }
+
+            return 0;
+        }
+    }
+
+    /**
+     * Create an exclusive read+write lock on a table
+     *
+     * @param string $tableName
+     *
+     * @throws \BadMethodCallException When trying to acquire a second lock
+     * @throws Exception
+     * @since 9.1.0
+     */
+    public function lockTable($tableName) {
+        if ($this->lockedTable !== null) {
+            throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
+        }
+
+        $tableName = $this->tablePrefix . $tableName;
+        $this->lockedTable = $tableName;
+        $this->adapter->lockTable($tableName);
+    }
+
+    /**
+     * Release a previous acquired lock again
+     *
+     * @throws Exception
+     * @since 9.1.0
+     */
+    public function unlockTable() {
+        $this->adapter->unlockTable();
+        $this->lockedTable = null;
+    }
+
+    /**
+     * returns the error code and message as a string for logging
+     * works with DoctrineException
+     * @return string
+     */
+    public function getError() {
+        $msg = $this->errorCode() . ': ';
+        $errorInfo = $this->errorInfo();
+        if (!empty($errorInfo)) {
+            $msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+            $msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+            $msg .= 'Driver Message = '.$errorInfo[2];
+        }
+        return $msg;
+    }
+
+    public function errorCode() {
+        return -1;
+    }
+
+    public function errorInfo() {
+        return [];
+    }
+
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     *
+     * @throws Exception
+     */
+    public function dropTable($table) {
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        if ($schema->tablesExist([$table])) {
+            $schema->dropTable($table);
+        }
+    }
+
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     *
+     * @return bool
+     * @throws Exception
+     */
+    public function tableExists($table) {
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        return $schema->tablesExist([$table]);
+    }
+
+    // internal use
+    /**
+     * @param string $statement
+     * @return string
+     */
+    protected function replaceTablePrefix($statement) {
+        return str_replace('*PREFIX*', $this->tablePrefix, $statement);
+    }
+
+    /**
+     * Check if a transaction is active
+     *
+     * @return bool
+     * @since 8.2.0
+     */
+    public function inTransaction() {
+        return $this->getTransactionNestingLevel() > 0;
+    }
+
+    /**
+     * Escape a parameter to be used in a LIKE query
+     *
+     * @param string $param
+     * @return string
+     */
+    public function escapeLikeParameter($param) {
+        return addcslashes($param, '\\_%');
+    }
+
+    /**
+     * Check whether or not the current database support 4byte wide unicode
+     *
+     * @return bool
+     * @since 11.0.0
+     */
+    public function supports4ByteText() {
+        if (!$this->getDatabasePlatform() instanceof MySQLPlatform) {
+            return true;
+        }
+        return $this->getParams()['charset'] === 'utf8mb4';
+    }
+
+
+    /**
+     * Create the schema of the connected database
+     *
+     * @return Schema
+     * @throws Exception
+     */
+    public function createSchema() {
+        $migrator = $this->getMigrator();
+        return $migrator->createSchema();
+    }
+
+    /**
+     * Migrate the database to the given schema
+     *
+     * @param Schema $toSchema
+     *
+     * @throws Exception
+     */
+    public function migrateToSchema(Schema $toSchema) {
+        $migrator = $this->getMigrator();
+        $migrator->migrate($toSchema);
+    }
+
+    private function getMigrator() {
+        // TODO properly inject those dependencies
+        $random = \OC::$server->getSecureRandom();
+        $platform = $this->getDatabasePlatform();
+        $config = \OC::$server->getConfig();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        if ($platform instanceof SqlitePlatform) {
+            return new SQLiteMigrator($this, $config, $dispatcher);
+        } elseif ($platform instanceof OraclePlatform) {
+            return new OracleMigrator($this, $config, $dispatcher);
+        } elseif ($platform instanceof MySQLPlatform) {
+            return new MySQLMigrator($this, $config, $dispatcher);
+        } elseif ($platform instanceof PostgreSQL94Platform) {
+            return new PostgreSqlMigrator($this, $config, $dispatcher);
+        } else {
+            return new Migrator($this, $config, $dispatcher);
+        }
+    }
 }

lib/private/legacy/OC_DB.php

Indentation +142 added lines, -142 removed lines

@@ -36,155 +36,155 @@
  */
 class OC_DB {
 
-	/**
-	 * Prepare a SQL query
-	 * @param string $query Query string
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @param bool|null $isManipulation
-	 * @throws \OC\DatabaseException
-	 * @return OC_DB_StatementWrapper prepared SQL query
-	 * @deprecated 21.0.0 Please use \OCP\IDBConnection::getQueryBuilder() instead
-	 *
-	 * SQL query via Doctrine prepare(), needs to be execute()'d!
-	 */
-	public static function prepare($query , $limit = null, $offset = null, $isManipulation = null) {
-		$connection = \OC::$server->getDatabaseConnection();
+    /**
+     * Prepare a SQL query
+     * @param string $query Query string
+     * @param int|null $limit
+     * @param int|null $offset
+     * @param bool|null $isManipulation
+     * @throws \OC\DatabaseException
+     * @return OC_DB_StatementWrapper prepared SQL query
+     * @deprecated 21.0.0 Please use \OCP\IDBConnection::getQueryBuilder() instead
+     *
+     * SQL query via Doctrine prepare(), needs to be execute()'d!
+     */
+    public static function prepare($query , $limit = null, $offset = null, $isManipulation = null) {
+        $connection = \OC::$server->getDatabaseConnection();
 
-		if ($isManipulation === null) {
-			//try to guess, so we return the number of rows on manipulations
-			$isManipulation = self::isManipulation($query);
-		}
+        if ($isManipulation === null) {
+            //try to guess, so we return the number of rows on manipulations
+            $isManipulation = self::isManipulation($query);
+        }
 
-		// return the result
-		try {
-			$result = $connection->prepare($query, $limit, $offset);
-		} catch (\Doctrine\DBAL\Exception $e) {
-			throw new \OC\DatabaseException($e->getMessage());
-		}
-		// differentiate between query and manipulation
-		return new OC_DB_StatementWrapper($result, $isManipulation);
-	}
+        // return the result
+        try {
+            $result = $connection->prepare($query, $limit, $offset);
+        } catch (\Doctrine\DBAL\Exception $e) {
+            throw new \OC\DatabaseException($e->getMessage());
+        }
+        // differentiate between query and manipulation
+        return new OC_DB_StatementWrapper($result, $isManipulation);
+    }
 
-	/**
-	 * tries to guess the type of statement based on the first 10 characters
-	 * the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
-	 *
-	 * @param string $sql
-	 * @return bool
-	 */
-	public static function isManipulation($sql) {
-		$sql = trim($sql);
-		$selectOccurrence = stripos($sql, 'SELECT');
-		if ($selectOccurrence === 0) {
-			return false;
-		}
-		$insertOccurrence = stripos($sql, 'INSERT');
-		if ($insertOccurrence === 0) {
-			return true;
-		}
-		$updateOccurrence = stripos($sql, 'UPDATE');
-		if ($updateOccurrence === 0) {
-			return true;
-		}
-		$deleteOccurrence = stripos($sql, 'DELETE');
-		if ($deleteOccurrence === 0) {
-			return true;
-		}
+    /**
+     * tries to guess the type of statement based on the first 10 characters
+     * the current check allows some whitespace but does not work with IF EXISTS or other more complex statements
+     *
+     * @param string $sql
+     * @return bool
+     */
+    public static function isManipulation($sql) {
+        $sql = trim($sql);
+        $selectOccurrence = stripos($sql, 'SELECT');
+        if ($selectOccurrence === 0) {
+            return false;
+        }
+        $insertOccurrence = stripos($sql, 'INSERT');
+        if ($insertOccurrence === 0) {
+            return true;
+        }
+        $updateOccurrence = stripos($sql, 'UPDATE');
+        if ($updateOccurrence === 0) {
+            return true;
+        }
+        $deleteOccurrence = stripos($sql, 'DELETE');
+        if ($deleteOccurrence === 0) {
+            return true;
+        }
 
-		// This is triggered with "SHOW VERSION" and some more, so until we made a list, we keep this out.
-		// \OC::$server->getLogger()->logException(new \Exception('Can not detect if query is manipulating: ' . $sql));
+        // This is triggered with "SHOW VERSION" and some more, so until we made a list, we keep this out.
+        // \OC::$server->getLogger()->logException(new \Exception('Can not detect if query is manipulating: ' . $sql));
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * execute a prepared statement, on error write log and throw exception
-	 * @param mixed $stmt OC_DB_StatementWrapper,
-	 *					  an array with 'sql' and optionally 'limit' and 'offset' keys
-	 *					.. or a simple sql query string
-	 * @param array $parameters
-	 * @return OC_DB_StatementWrapper
-	 * @throws \OC\DatabaseException
-	 * @deprecated 21.0.0 Please use \OCP\IDBConnection::getQueryBuilder() instead
-	 */
-	public static function executeAudited($stmt, array $parameters = []) {
-		if (is_string($stmt)) {
-			// convert to an array with 'sql'
-			if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT
-				// TODO try to convert LIMIT OFFSET notation to parameters
-				$message = 'LIMIT and OFFSET are forbidden for portability reasons,'
-						 . ' pass an array with \'limit\' and \'offset\' instead';
-				throw new \OC\DatabaseException($message);
-			}
-			$stmt = ['sql' => $stmt, 'limit' => null, 'offset' => null];
-		}
-		if (is_array($stmt)) {
-			// convert to prepared statement
-			if (! array_key_exists('sql', $stmt)) {
-				$message = 'statement array must at least contain key \'sql\'';
-				throw new \OC\DatabaseException($message);
-			}
-			if (! array_key_exists('limit', $stmt)) {
-				$stmt['limit'] = null;
-			}
-			if (! array_key_exists('limit', $stmt)) {
-				$stmt['offset'] = null;
-			}
-			$stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']);
-		}
-		self::raiseExceptionOnError($stmt, 'Could not prepare statement');
-		if ($stmt instanceof OC_DB_StatementWrapper) {
-			$result = $stmt->execute($parameters);
-			self::raiseExceptionOnError($result, 'Could not execute statement');
-		} else {
-			if (is_object($stmt)) {
-				$message = 'Expected a prepared statement or array got ' . get_class($stmt);
-			} else {
-				$message = 'Expected a prepared statement or array got ' . gettype($stmt);
-			}
-			throw new \OC\DatabaseException($message);
-		}
-		return $result;
-	}
+    /**
+     * execute a prepared statement, on error write log and throw exception
+     * @param mixed $stmt OC_DB_StatementWrapper,
+     *					  an array with 'sql' and optionally 'limit' and 'offset' keys
+     *					.. or a simple sql query string
+     * @param array $parameters
+     * @return OC_DB_StatementWrapper
+     * @throws \OC\DatabaseException
+     * @deprecated 21.0.0 Please use \OCP\IDBConnection::getQueryBuilder() instead
+     */
+    public static function executeAudited($stmt, array $parameters = []) {
+        if (is_string($stmt)) {
+            // convert to an array with 'sql'
+            if (stripos($stmt, 'LIMIT') !== false) { //OFFSET requires LIMIT, so we only need to check for LIMIT
+                // TODO try to convert LIMIT OFFSET notation to parameters
+                $message = 'LIMIT and OFFSET are forbidden for portability reasons,'
+                            . ' pass an array with \'limit\' and \'offset\' instead';
+                throw new \OC\DatabaseException($message);
+            }
+            $stmt = ['sql' => $stmt, 'limit' => null, 'offset' => null];
+        }
+        if (is_array($stmt)) {
+            // convert to prepared statement
+            if (! array_key_exists('sql', $stmt)) {
+                $message = 'statement array must at least contain key \'sql\'';
+                throw new \OC\DatabaseException($message);
+            }
+            if (! array_key_exists('limit', $stmt)) {
+                $stmt['limit'] = null;
+            }
+            if (! array_key_exists('limit', $stmt)) {
+                $stmt['offset'] = null;
+            }
+            $stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']);
+        }
+        self::raiseExceptionOnError($stmt, 'Could not prepare statement');
+        if ($stmt instanceof OC_DB_StatementWrapper) {
+            $result = $stmt->execute($parameters);
+            self::raiseExceptionOnError($result, 'Could not execute statement');
+        } else {
+            if (is_object($stmt)) {
+                $message = 'Expected a prepared statement or array got ' . get_class($stmt);
+            } else {
+                $message = 'Expected a prepared statement or array got ' . gettype($stmt);
+            }
+            throw new \OC\DatabaseException($message);
+        }
+        return $result;
+    }
 
-	/**
-	 * check if a result is an error and throws an exception, works with \Doctrine\DBAL\Exception
-	 * @param mixed $result
-	 * @param string $message
-	 * @return void
-	 * @throws \OC\DatabaseException
-	 */
-	public static function raiseExceptionOnError($result, $message = null) {
-		if ($result === false) {
-			if ($message === null) {
-				$message = self::getErrorMessage();
-			} else {
-				$message .= ', Root cause:' . self::getErrorMessage();
-			}
-			throw new \OC\DatabaseException($message);
-		}
-	}
+    /**
+     * check if a result is an error and throws an exception, works with \Doctrine\DBAL\Exception
+     * @param mixed $result
+     * @param string $message
+     * @return void
+     * @throws \OC\DatabaseException
+     */
+    public static function raiseExceptionOnError($result, $message = null) {
+        if ($result === false) {
+            if ($message === null) {
+                $message = self::getErrorMessage();
+            } else {
+                $message .= ', Root cause:' . self::getErrorMessage();
+            }
+            throw new \OC\DatabaseException($message);
+        }
+    }
 
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 */
-	public static function getErrorMessage() {
-		$connection = \OC::$server->getDatabaseConnection();
-		return $connection->getError();
-	}
+    /**
+     * returns the error code and message as a string for logging
+     * works with DoctrineException
+     * @return string
+     */
+    public static function getErrorMessage() {
+        $connection = \OC::$server->getDatabaseConnection();
+        return $connection->getError();
+    }
 
-	/**
-	 * Checks if a table exists in the database - the database prefix will be prepended
-	 *
-	 * @param string $table
-	 * @return bool
-	 * @throws \OC\DatabaseException
-	 */
-	public static function tableExists($table) {
-		$connection = \OC::$server->getDatabaseConnection();
-		return $connection->tableExists($table);
-	}
+    /**
+     * Checks if a table exists in the database - the database prefix will be prepended
+     *
+     * @param string $table
+     * @return bool
+     * @throws \OC\DatabaseException
+     */
+    public static function tableExists($table) {
+        $connection = \OC::$server->getDatabaseConnection();
+        return $connection->tableExists($table);
+    }
 }

lib/private/legacy/OC_App.php

Indentation +1122 added lines, -1122 removed lines

@@ -69,1126 +69,1126 @@
  * upgrading and removing apps.
  */
 class OC_App {
-	private static $adminForms = [];
-	private static $personalForms = [];
-	private static $appTypes = [];
-	private static $loadedApps = [];
-	private static $altLogin = [];
-	private static $alreadyRegistered = [];
-	public const supportedApp = 300;
-	public const officialApp = 200;
-
-	/**
-	 * clean the appId
-	 *
-	 * @psalm-taint-escape file
-	 * @psalm-taint-escape include
-	 *
-	 * @param string $app AppId that needs to be cleaned
-	 * @return string
-	 */
-	public static function cleanAppId(string $app): string {
-		return str_replace(['\0', '/', '\\', '..'], '', $app);
-	}
-
-	/**
-	 * Check if an app is loaded
-	 *
-	 * @param string $app
-	 * @return bool
-	 */
-	public static function isAppLoaded(string $app): bool {
-		return isset(self::$loadedApps[$app]);
-	}
-
-	/**
-	 * loads all apps
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 *
-	 * This function walks through the ownCloud directory and loads all apps
-	 * it can find. A directory contains an app if the file /appinfo/info.xml
-	 * exists.
-	 *
-	 * if $types is set to non-empty array, only apps of those types will be loaded
-	 */
-	public static function loadApps(array $types = []): bool {
-		if ((bool) \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
-			return false;
-		}
-		// Load the enabled apps here
-		$apps = self::getEnabledApps();
-
-		// Add each apps' folder as allowed class path
-		foreach ($apps as $app) {
-			// If the app is already loaded then autoloading it makes no sense
-			if (!isset(self::$loadedApps[$app])) {
-				$path = self::getAppPath($app);
-				if ($path !== false) {
-					self::registerAutoloading($app, $path);
-				}
-			}
-		}
-
-		// prevent app.php from printing output
-		ob_start();
-		foreach ($apps as $app) {
-			if (!isset(self::$loadedApps[$app]) && ($types === [] || self::isType($app, $types))) {
-				self::loadApp($app);
-			}
-		}
-		ob_end_clean();
-
-		return true;
-	}
-
-	/**
-	 * load a single app
-	 *
-	 * @param string $app
-	 * @throws Exception
-	 */
-	public static function loadApp(string $app) {
-		self::$loadedApps[$app] = true;
-		$appPath = self::getAppPath($app);
-		if ($appPath === false) {
-			return;
-		}
-
-		// in case someone calls loadApp() directly
-		self::registerAutoloading($app, $appPath);
-
-		/** @var Coordinator $coordinator */
-		$coordinator = \OC::$server->query(Coordinator::class);
-		$isBootable = $coordinator->isBootable($app);
-
-		$hasAppPhpFile = is_file($appPath . '/appinfo/app.php');
-
-		if ($isBootable && $hasAppPhpFile) {
-			\OC::$server->getLogger()->error('/appinfo/app.php is not loaded when \OCP\AppFramework\Bootstrap\IBootstrap on the application class is used. Migrate everything from app.php to the Application class.', [
-				'app' => $app,
-			]);
-		} elseif ($hasAppPhpFile) {
-			\OC::$server->getLogger()->debug('/appinfo/app.php is deprecated, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
-				'app' => $app,
-			]);
-			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
-			try {
-				self::requireAppFile($app);
-			} catch (Throwable $ex) {
-				if ($ex instanceof ServerNotAvailableException) {
-					throw $ex;
-				}
-				if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) {
-					\OC::$server->getLogger()->logException($ex, [
-						'message' => "App $app threw an error during app.php load and will be disabled: " . $ex->getMessage(),
-					]);
-
-					// Only disable apps which are not shipped and that are not authentication apps
-					\OC::$server->getAppManager()->disableApp($app, true);
-				} else {
-					\OC::$server->getLogger()->logException($ex, [
-						'message' => "App $app threw an error during app.php load: " . $ex->getMessage(),
-					]);
-				}
-			}
-			\OC::$server->getEventLogger()->end('load_app_' . $app);
-		}
-		$coordinator->bootApp($app);
-
-		$info = self::getAppInfo($app);
-		if (!empty($info['activity']['filters'])) {
-			foreach ($info['activity']['filters'] as $filter) {
-				\OC::$server->getActivityManager()->registerFilter($filter);
-			}
-		}
-		if (!empty($info['activity']['settings'])) {
-			foreach ($info['activity']['settings'] as $setting) {
-				\OC::$server->getActivityManager()->registerSetting($setting);
-			}
-		}
-		if (!empty($info['activity']['providers'])) {
-			foreach ($info['activity']['providers'] as $provider) {
-				\OC::$server->getActivityManager()->registerProvider($provider);
-			}
-		}
-
-		if (!empty($info['settings']['admin'])) {
-			foreach ($info['settings']['admin'] as $setting) {
-				\OC::$server->getSettingsManager()->registerSetting('admin', $setting);
-			}
-		}
-		if (!empty($info['settings']['admin-section'])) {
-			foreach ($info['settings']['admin-section'] as $section) {
-				\OC::$server->getSettingsManager()->registerSection('admin', $section);
-			}
-		}
-		if (!empty($info['settings']['personal'])) {
-			foreach ($info['settings']['personal'] as $setting) {
-				\OC::$server->getSettingsManager()->registerSetting('personal', $setting);
-			}
-		}
-		if (!empty($info['settings']['personal-section'])) {
-			foreach ($info['settings']['personal-section'] as $section) {
-				\OC::$server->getSettingsManager()->registerSection('personal', $section);
-			}
-		}
-
-		if (!empty($info['collaboration']['plugins'])) {
-			// deal with one or many plugin entries
-			$plugins = isset($info['collaboration']['plugins']['plugin']['@value']) ?
-				[$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
-			foreach ($plugins as $plugin) {
-				if ($plugin['@attributes']['type'] === 'collaborator-search') {
-					$pluginInfo = [
-						'shareType' => $plugin['@attributes']['share-type'],
-						'class' => $plugin['@value'],
-					];
-					\OC::$server->getCollaboratorSearch()->registerPlugin($pluginInfo);
-				} elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
-					\OC::$server->getAutoCompleteManager()->registerSorter($plugin['@value']);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @internal
-	 * @param string $app
-	 * @param string $path
-	 * @param bool $force
-	 */
-	public static function registerAutoloading(string $app, string $path, bool $force = false) {
-		$key = $app . '-' . $path;
-		if (!$force && isset(self::$alreadyRegistered[$key])) {
-			return;
-		}
-
-		self::$alreadyRegistered[$key] = true;
-
-		// Register on PSR-4 composer autoloader
-		$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
-		\OC::$server->registerNamespace($app, $appNamespace);
-
-		if (file_exists($path . '/composer/autoload.php')) {
-			require_once $path . '/composer/autoload.php';
-		} else {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
-			// Register on legacy autoloader
-			\OC::$loader->addValidRoot($path);
-		}
-
-		// Register Test namespace only when testing
-		if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
-		}
-	}
-
-	/**
-	 * Load app.php from the given app
-	 *
-	 * @param string $app app name
-	 * @throws Error
-	 */
-	private static function requireAppFile(string $app) {
-		// encapsulated here to avoid variable scope conflicts
-		require_once $app . '/appinfo/app.php';
-	}
-
-	/**
-	 * check if an app is of a specific type
-	 *
-	 * @param string $app
-	 * @param array $types
-	 * @return bool
-	 */
-	public static function isType(string $app, array $types): bool {
-		$appTypes = self::getAppTypes($app);
-		foreach ($types as $type) {
-			if (array_search($type, $appTypes) !== false) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * get the types of an app
-	 *
-	 * @param string $app
-	 * @return array
-	 */
-	private static function getAppTypes(string $app): array {
-		//load the cache
-		if (count(self::$appTypes) == 0) {
-			self::$appTypes = \OC::$server->getAppConfig()->getValues(false, 'types');
-		}
-
-		if (isset(self::$appTypes[$app])) {
-			return explode(',', self::$appTypes[$app]);
-		}
-
-		return [];
-	}
-
-	/**
-	 * read app types from info.xml and cache them in the database
-	 */
-	public static function setAppTypes(string $app) {
-		$appManager = \OC::$server->getAppManager();
-		$appData = $appManager->getAppInfo($app);
-		if (!is_array($appData)) {
-			return;
-		}
-
-		if (isset($appData['types'])) {
-			$appTypes = implode(',', $appData['types']);
-		} else {
-			$appTypes = '';
-			$appData['types'] = [];
-		}
-
-		$config = \OC::$server->getConfig();
-		$config->setAppValue($app, 'types', $appTypes);
-
-		if ($appManager->hasProtectedAppType($appData['types'])) {
-			$enabled = $config->getAppValue($app, 'enabled', 'yes');
-			if ($enabled !== 'yes' && $enabled !== 'no') {
-				$config->setAppValue($app, 'enabled', 'yes');
-			}
-		}
-	}
-
-	/**
-	 * Returns apps enabled for the current user.
-	 *
-	 * @param bool $forceRefresh whether to refresh the cache
-	 * @param bool $all whether to return apps for all users, not only the
-	 * currently logged in one
-	 * @return string[]
-	 */
-	public static function getEnabledApps(bool $forceRefresh = false, bool $all = false): array {
-		if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			return [];
-		}
-		// in incognito mode or when logged out, $user will be false,
-		// which is also the case during an upgrade
-		$appManager = \OC::$server->getAppManager();
-		if ($all) {
-			$user = null;
-		} else {
-			$user = \OC::$server->getUserSession()->getUser();
-		}
-
-		if (is_null($user)) {
-			$apps = $appManager->getInstalledApps();
-		} else {
-			$apps = $appManager->getEnabledAppsForUser($user);
-		}
-		$apps = array_filter($apps, function ($app) {
-			return $app !== 'files';//we add this manually
-		});
-		sort($apps);
-		array_unshift($apps, 'files');
-		return $apps;
-	}
-
-	/**
-	 * checks whether or not an app is enabled
-	 *
-	 * @param string $app app
-	 * @return bool
-	 * @deprecated 13.0.0 use \OC::$server->getAppManager()->isEnabledForUser($appId)
-	 *
-	 * This function checks whether or not an app is enabled.
-	 */
-	public static function isEnabled(string $app): bool {
-		return \OC::$server->getAppManager()->isEnabledForUser($app);
-	}
-
-	/**
-	 * enables an app
-	 *
-	 * @param string $appId
-	 * @param array $groups (optional) when set, only these groups will have access to the app
-	 * @throws \Exception
-	 * @return void
-	 *
-	 * This function set an app as enabled in appconfig.
-	 */
-	public function enable(string $appId,
-						   array $groups = []) {
-
-		// Check if app is already downloaded
-		/** @var Installer $installer */
-		$installer = \OC::$server->query(Installer::class);
-		$isDownloaded = $installer->isDownloaded($appId);
-
-		if (!$isDownloaded) {
-			$installer->downloadApp($appId);
-		}
-
-		$installer->installApp($appId);
-
-		$appManager = \OC::$server->getAppManager();
-		if ($groups !== []) {
-			$groupManager = \OC::$server->getGroupManager();
-			$groupsList = [];
-			foreach ($groups as $group) {
-				$groupItem = $groupManager->get($group);
-				if ($groupItem instanceof \OCP\IGroup) {
-					$groupsList[] = $groupManager->get($group);
-				}
-			}
-			$appManager->enableAppForGroups($appId, $groupsList);
-		} else {
-			$appManager->enableApp($appId);
-		}
-	}
-
-	/**
-	 * Get the path where to install apps
-	 *
-	 * @return string|false
-	 */
-	public static function getInstallPath() {
-		if (\OC::$server->getSystemConfig()->getValue('appstoreenabled', true) == false) {
-			return false;
-		}
-
-		foreach (OC::$APPSROOTS as $dir) {
-			if (isset($dir['writable']) && $dir['writable'] === true) {
-				return $dir['path'];
-			}
-		}
-
-		\OCP\Util::writeLog('core', 'No application directories are marked as writable.', ILogger::ERROR);
-		return null;
-	}
-
-
-	/**
-	 * search for an app in all app-directories
-	 *
-	 * @param string $appId
-	 * @return false|string
-	 */
-	public static function findAppInDirectories(string $appId) {
-		$sanitizedAppId = self::cleanAppId($appId);
-		if ($sanitizedAppId !== $appId) {
-			return false;
-		}
-		static $app_dir = [];
-
-		if (isset($app_dir[$appId])) {
-			return $app_dir[$appId];
-		}
-
-		$possibleApps = [];
-		foreach (OC::$APPSROOTS as $dir) {
-			if (file_exists($dir['path'] . '/' . $appId)) {
-				$possibleApps[] = $dir;
-			}
-		}
-
-		if (empty($possibleApps)) {
-			return false;
-		} elseif (count($possibleApps) === 1) {
-			$dir = array_shift($possibleApps);
-			$app_dir[$appId] = $dir;
-			return $dir;
-		} else {
-			$versionToLoad = [];
-			foreach ($possibleApps as $possibleApp) {
-				$version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
-				if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
-					$versionToLoad = [
-						'dir' => $possibleApp,
-						'version' => $version,
-					];
-				}
-			}
-			$app_dir[$appId] = $versionToLoad['dir'];
-			return $versionToLoad['dir'];
-			//TODO - write test
-		}
-	}
-
-	/**
-	 * Get the directory for the given app.
-	 * If the app is defined in multiple directories, the first one is taken. (false if not found)
-	 *
-	 * @psalm-taint-specialize
-	 *
-	 * @param string $appId
-	 * @return string|false
-	 * @deprecated 11.0.0 use \OC::$server->getAppManager()->getAppPath()
-	 */
-	public static function getAppPath(string $appId) {
-		if ($appId === null || trim($appId) === '') {
-			return false;
-		}
-
-		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return $dir['path'] . '/' . $appId;
-		}
-		return false;
-	}
-
-	/**
-	 * Get the path for the given app on the access
-	 * If the app is defined in multiple directories, the first one is taken. (false if not found)
-	 *
-	 * @param string $appId
-	 * @return string|false
-	 * @deprecated 18.0.0 use \OC::$server->getAppManager()->getAppWebPath()
-	 */
-	public static function getAppWebPath(string $appId) {
-		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return OC::$WEBROOT . $dir['url'] . '/' . $appId;
-		}
-		return false;
-	}
-
-	/**
-	 * get the last version of the app from appinfo/info.xml
-	 *
-	 * @param string $appId
-	 * @param bool $useCache
-	 * @return string
-	 * @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppVersion()
-	 */
-	public static function getAppVersion(string $appId, bool $useCache = true): string {
-		return \OC::$server->getAppManager()->getAppVersion($appId, $useCache);
-	}
-
-	/**
-	 * get app's version based on it's path
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public static function getAppVersionByPath(string $path): string {
-		$infoFile = $path . '/appinfo/info.xml';
-		$appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true);
-		return isset($appData['version']) ? $appData['version'] : '';
-	}
-
-
-	/**
-	 * Read all app metadata from the info.xml file
-	 *
-	 * @param string $appId id of the app or the path of the info.xml file
-	 * @param bool $path
-	 * @param string $lang
-	 * @return array|null
-	 * @note all data is read from info.xml, not just pre-defined fields
-	 * @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppInfo()
-	 */
-	public static function getAppInfo(string $appId, bool $path = false, string $lang = null) {
-		return \OC::$server->getAppManager()->getAppInfo($appId, $path, $lang);
-	}
-
-	/**
-	 * Returns the navigation
-	 *
-	 * @return array
-	 * @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll()
-	 *
-	 * This function returns an array containing all entries added. The
-	 * entries are sorted by the key 'order' ascending. Additional to the keys
-	 * given for each app the following keys exist:
-	 *   - active: boolean, signals if the user is on this navigation entry
-	 */
-	public static function getNavigation(): array {
-		return OC::$server->getNavigationManager()->getAll();
-	}
-
-	/**
-	 * Returns the Settings Navigation
-	 *
-	 * @return string[]
-	 * @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll('settings')
-	 *
-	 * This function returns an array containing all settings pages added. The
-	 * entries are sorted by the key 'order' ascending.
-	 */
-	public static function getSettingsNavigation(): array {
-		return OC::$server->getNavigationManager()->getAll('settings');
-	}
-
-	/**
-	 * get the id of loaded app
-	 *
-	 * @return string
-	 */
-	public static function getCurrentApp(): string {
-		$request = \OC::$server->getRequest();
-		$script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
-		$topFolder = substr($script, 0, strpos($script, '/') ?: 0);
-		if (empty($topFolder)) {
-			$path_info = $request->getPathInfo();
-			if ($path_info) {
-				$topFolder = substr($path_info, 1, strpos($path_info, '/', 1) - 1);
-			}
-		}
-		if ($topFolder == 'apps') {
-			$length = strlen($topFolder);
-			return substr($script, $length + 1, strpos($script, '/', $length + 1) - $length - 1) ?: '';
-		} else {
-			return $topFolder;
-		}
-	}
-
-	/**
-	 * @param string $type
-	 * @return array
-	 */
-	public static function getForms(string $type): array {
-		$forms = [];
-		switch ($type) {
-			case 'admin':
-				$source = self::$adminForms;
-				break;
-			case 'personal':
-				$source = self::$personalForms;
-				break;
-			default:
-				return [];
-		}
-		foreach ($source as $form) {
-			$forms[] = include $form;
-		}
-		return $forms;
-	}
-
-	/**
-	 * register an admin form to be shown
-	 *
-	 * @param string $app
-	 * @param string $page
-	 */
-	public static function registerAdmin(string $app, string $page) {
-		self::$adminForms[] = $app . '/' . $page . '.php';
-	}
-
-	/**
-	 * register a personal form to be shown
-	 * @param string $app
-	 * @param string $page
-	 */
-	public static function registerPersonal(string $app, string $page) {
-		self::$personalForms[] = $app . '/' . $page . '.php';
-	}
-
-	/**
-	 * @param array $entry
-	 * @deprecated 20.0.0 Please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface
-	 */
-	public static function registerLogIn(array $entry) {
-		\OC::$server->getLogger()->debug('OC_App::registerLogIn() is deprecated, please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface');
-		self::$altLogin[] = $entry;
-	}
-
-	/**
-	 * @return array
-	 */
-	public static function getAlternativeLogIns(): array {
-		/** @var Coordinator $bootstrapCoordinator */
-		$bootstrapCoordinator = \OC::$server->query(Coordinator::class);
-
-		foreach ($bootstrapCoordinator->getRegistrationContext()->getAlternativeLogins() as $registration) {
-			if (!in_array(IAlternativeLogin::class, class_implements($registration->getService()), true)) {
-				\OC::$server->getLogger()->error('Alternative login option {option} does not implement {interface} and is therefore ignored.', [
-					'option' => $registration->getService(),
-					'interface' => IAlternativeLogin::class,
-					'app' => $registration->getAppId(),
-				]);
-				continue;
-			}
-
-			try {
-				/** @var IAlternativeLogin $provider */
-				$provider = \OC::$server->query($registration->getService());
-			} catch (QueryException $e) {
-				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Alternative login option {option} can not be initialised.',
-					'option' => $registration->getService(),
-					'app' => $registration->getAppId(),
-				]);
-			}
-
-			try {
-				$provider->load();
-
-				self::$altLogin[] = [
-					'name' => $provider->getLabel(),
-					'href' => $provider->getLink(),
-					'style' => $provider->getClass(),
-				];
-			} catch (Throwable $e) {
-				\OC::$server->getLogger()->logException($e, [
-					'message' => 'Alternative login option {option} had an error while loading.',
-					'option' => $registration->getService(),
-					'app' => $registration->getAppId(),
-				]);
-			}
-		}
-
-		return self::$altLogin;
-	}
-
-	/**
-	 * get a list of all apps in the apps folder
-	 *
-	 * @return string[] an array of app names (string IDs)
-	 * @todo: change the name of this method to getInstalledApps, which is more accurate
-	 */
-	public static function getAllApps(): array {
-		$apps = [];
-
-		foreach (OC::$APPSROOTS as $apps_dir) {
-			if (!is_readable($apps_dir['path'])) {
-				\OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], ILogger::WARN);
-				continue;
-			}
-			$dh = opendir($apps_dir['path']);
-
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) {
-						$apps[] = $file;
-					}
-				}
-			}
-		}
-
-		$apps = array_unique($apps);
-
-		return $apps;
-	}
-
-	/**
-	 * List all apps, this is used in apps.php
-	 *
-	 * @return array
-	 */
-	public function listAllApps(): array {
-		$installedApps = OC_App::getAllApps();
-
-		$appManager = \OC::$server->getAppManager();
-		//we don't want to show configuration for these
-		$blacklist = $appManager->getAlwaysEnabledApps();
-		$appList = [];
-		$langCode = \OC::$server->getL10N('core')->getLanguageCode();
-		$urlGenerator = \OC::$server->getURLGenerator();
-		/** @var \OCP\Support\Subscription\IRegistry $subscriptionRegistry */
-		$subscriptionRegistry = \OC::$server->query(\OCP\Support\Subscription\IRegistry::class);
-		$supportedApps = $subscriptionRegistry->delegateGetSupportedApps();
-
-		foreach ($installedApps as $app) {
-			if (array_search($app, $blacklist) === false) {
-				$info = OC_App::getAppInfo($app, false, $langCode);
-				if (!is_array($info)) {
-					\OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', ILogger::ERROR);
-					continue;
-				}
-
-				if (!isset($info['name'])) {
-					\OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', ILogger::ERROR);
-					continue;
-				}
-
-				$enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'no');
-				$info['groups'] = null;
-				if ($enabled === 'yes') {
-					$active = true;
-				} elseif ($enabled === 'no') {
-					$active = false;
-				} else {
-					$active = true;
-					$info['groups'] = $enabled;
-				}
-
-				$info['active'] = $active;
-
-				if ($appManager->isShipped($app)) {
-					$info['internal'] = true;
-					$info['level'] = self::officialApp;
-					$info['removable'] = false;
-				} else {
-					$info['internal'] = false;
-					$info['removable'] = true;
-				}
-
-				if (in_array($app, $supportedApps)) {
-					$info['level'] = self::supportedApp;
-				}
-
-				$appPath = self::getAppPath($app);
-				if ($appPath !== false) {
-					$appIcon = $appPath . '/img/' . $app . '.svg';
-					if (file_exists($appIcon)) {
-						$info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
-						$info['previewAsIcon'] = true;
-					} else {
-						$appIcon = $appPath . '/img/app.svg';
-						if (file_exists($appIcon)) {
-							$info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
-							$info['previewAsIcon'] = true;
-						}
-					}
-				}
-				// fix documentation
-				if (isset($info['documentation']) && is_array($info['documentation'])) {
-					foreach ($info['documentation'] as $key => $url) {
-						// If it is not an absolute URL we assume it is a key
-						// i.e. admin-ldap will get converted to go.php?to=admin-ldap
-						if (stripos($url, 'https://') !== 0 && stripos($url, 'http://') !== 0) {
-							$url = $urlGenerator->linkToDocs($url);
-						}
-
-						$info['documentation'][$key] = $url;
-					}
-				}
-
-				$info['version'] = OC_App::getAppVersion($app);
-				$appList[] = $info;
-			}
-		}
-
-		return $appList;
-	}
-
-	public static function shouldUpgrade(string $app): bool {
-		$versions = self::getAppVersions();
-		$currentVersion = OC_App::getAppVersion($app);
-		if ($currentVersion && isset($versions[$app])) {
-			$installedVersion = $versions[$app];
-			if (!version_compare($currentVersion, $installedVersion, '=')) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Adjust the number of version parts of $version1 to match
-	 * the number of version parts of $version2.
-	 *
-	 * @param string $version1 version to adjust
-	 * @param string $version2 version to take the number of parts from
-	 * @return string shortened $version1
-	 */
-	private static function adjustVersionParts(string $version1, string $version2): string {
-		$version1 = explode('.', $version1);
-		$version2 = explode('.', $version2);
-		// reduce $version1 to match the number of parts in $version2
-		while (count($version1) > count($version2)) {
-			array_pop($version1);
-		}
-		// if $version1 does not have enough parts, add some
-		while (count($version1) < count($version2)) {
-			$version1[] = '0';
-		}
-		return implode('.', $version1);
-	}
-
-	/**
-	 * Check whether the current ownCloud version matches the given
-	 * application's version requirements.
-	 *
-	 * The comparison is made based on the number of parts that the
-	 * app info version has. For example for ownCloud 6.0.3 if the
-	 * app info version is expecting version 6.0, the comparison is
-	 * made on the first two parts of the ownCloud version.
-	 * This means that it's possible to specify "requiremin" => 6
-	 * and "requiremax" => 6 and it will still match ownCloud 6.0.3.
-	 *
-	 * @param string $ocVersion ownCloud version to check against
-	 * @param array $appInfo app info (from xml)
-	 *
-	 * @return boolean true if compatible, otherwise false
-	 */
-	public static function isAppCompatible(string $ocVersion, array $appInfo, bool $ignoreMax = false): bool {
-		$requireMin = '';
-		$requireMax = '';
-		if (isset($appInfo['dependencies']['nextcloud']['@attributes']['min-version'])) {
-			$requireMin = $appInfo['dependencies']['nextcloud']['@attributes']['min-version'];
-		} elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) {
-			$requireMin = $appInfo['dependencies']['owncloud']['@attributes']['min-version'];
-		} elseif (isset($appInfo['requiremin'])) {
-			$requireMin = $appInfo['requiremin'];
-		} elseif (isset($appInfo['require'])) {
-			$requireMin = $appInfo['require'];
-		}
-
-		if (isset($appInfo['dependencies']['nextcloud']['@attributes']['max-version'])) {
-			$requireMax = $appInfo['dependencies']['nextcloud']['@attributes']['max-version'];
-		} elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) {
-			$requireMax = $appInfo['dependencies']['owncloud']['@attributes']['max-version'];
-		} elseif (isset($appInfo['requiremax'])) {
-			$requireMax = $appInfo['requiremax'];
-		}
-
-		if (!empty($requireMin)
-			&& version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<')
-		) {
-			return false;
-		}
-
-		if (!$ignoreMax && !empty($requireMax)
-			&& version_compare(self::adjustVersionParts($ocVersion, $requireMax), $requireMax, '>')
-		) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * get the installed version of all apps
-	 */
-	public static function getAppVersions() {
-		static $versions;
-
-		if (!$versions) {
-			$appConfig = \OC::$server->getAppConfig();
-			$versions = $appConfig->getValues(false, 'installed_version');
-		}
-		return $versions;
-	}
-
-	/**
-	 * update the database for the app and call the update script
-	 *
-	 * @param string $appId
-	 * @return bool
-	 */
-	public static function updateApp(string $appId): bool {
-		$appPath = self::getAppPath($appId);
-		if ($appPath === false) {
-			return false;
-		}
-
-		if (is_file($appPath . '/appinfo/database.xml')) {
-			\OC::$server->getLogger()->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
-			return false;
-		}
-
-		\OC::$server->getAppManager()->clearAppsCache();
-		$appData = self::getAppInfo($appId);
-
-		$ignoreMaxApps = \OC::$server->getConfig()->getSystemValue('app_install_overwrite', []);
-		$ignoreMax = in_array($appId, $ignoreMaxApps, true);
-		\OC_App::checkAppDependencies(
-			\OC::$server->getConfig(),
-			\OC::$server->getL10N('core'),
-			$appData,
-			$ignoreMax
-		);
-
-		self::registerAutoloading($appId, $appPath, true);
-		self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
-
-		$ms = new MigrationService($appId, \OC::$server->get(\OC\DB\Connection::class));
-		$ms->migrate();
-
-		self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
-		self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']);
-		// update appversion in app manager
-		\OC::$server->getAppManager()->clearAppsCache();
-		\OC::$server->getAppManager()->getAppVersion($appId, false);
-
-		self::setupBackgroundJobs($appData['background-jobs']);
-
-		//set remote/public handlers
-		if (array_key_exists('ocsid', $appData)) {
-			\OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
-		} elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
-			\OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
-		}
-		foreach ($appData['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
-		}
-		foreach ($appData['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
-		}
-
-		self::setAppTypes($appId);
-
-		$version = \OC_App::getAppVersion($appId);
-		\OC::$server->getConfig()->setAppValue($appId, 'installed_version', $version);
-
-		\OC::$server->getEventDispatcher()->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_UPDATE, $appId
-		));
-
-		return true;
-	}
-
-	/**
-	 * @param string $appId
-	 * @param string[] $steps
-	 * @throws \OC\NeedsUpdateException
-	 */
-	public static function executeRepairSteps(string $appId, array $steps) {
-		if (empty($steps)) {
-			return;
-		}
-		// load the app
-		self::loadApp($appId);
-
-		$dispatcher = OC::$server->getEventDispatcher();
-
-		// load the steps
-		$r = new Repair([], $dispatcher, \OC::$server->get(LoggerInterface::class));
-		foreach ($steps as $step) {
-			try {
-				$r->addStep($step);
-			} catch (Exception $ex) {
-				$r->emit('\OC\Repair', 'error', [$ex->getMessage()]);
-				\OC::$server->getLogger()->logException($ex);
-			}
-		}
-		// run the steps
-		$r->run();
-	}
-
-	public static function setupBackgroundJobs(array $jobs) {
-		$queue = \OC::$server->getJobList();
-		foreach ($jobs as $job) {
-			$queue->add($job);
-		}
-	}
-
-	/**
-	 * @param string $appId
-	 * @param string[] $steps
-	 */
-	private static function setupLiveMigrations(string $appId, array $steps) {
-		$queue = \OC::$server->getJobList();
-		foreach ($steps as $step) {
-			$queue->add('OC\Migration\BackgroundRepair', [
-				'app' => $appId,
-				'step' => $step]);
-		}
-	}
-
-	/**
-	 * @param string $appId
-	 * @return \OC\Files\View|false
-	 */
-	public static function getStorage(string $appId) {
-		if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
-			if (\OC::$server->getUserSession()->isLoggedIn()) {
-				$view = new \OC\Files\View('/' . OC_User::getUser());
-				if (!$view->file_exists($appId)) {
-					$view->mkdir($appId);
-				}
-				return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
-			} else {
-				\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', ILogger::ERROR);
-				return false;
-			}
-		} else {
-			\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', ILogger::ERROR);
-			return false;
-		}
-	}
-
-	protected static function findBestL10NOption(array $options, string $lang): string {
-		// only a single option
-		if (isset($options['@value'])) {
-			return $options['@value'];
-		}
-
-		$fallback = $similarLangFallback = $englishFallback = false;
-
-		$lang = strtolower($lang);
-		$similarLang = $lang;
-		if (strpos($similarLang, '_')) {
-			// For "de_DE" we want to find "de" and the other way around
-			$similarLang = substr($lang, 0, strpos($lang, '_'));
-		}
-
-		foreach ($options as $option) {
-			if (is_array($option)) {
-				if ($fallback === false) {
-					$fallback = $option['@value'];
-				}
-
-				if (!isset($option['@attributes']['lang'])) {
-					continue;
-				}
-
-				$attributeLang = strtolower($option['@attributes']['lang']);
-				if ($attributeLang === $lang) {
-					return $option['@value'];
-				}
-
-				if ($attributeLang === $similarLang) {
-					$similarLangFallback = $option['@value'];
-				} elseif (strpos($attributeLang, $similarLang . '_') === 0) {
-					if ($similarLangFallback === false) {
-						$similarLangFallback = $option['@value'];
-					}
-				}
-			} else {
-				$englishFallback = $option;
-			}
-		}
-
-		if ($similarLangFallback !== false) {
-			return $similarLangFallback;
-		} elseif ($englishFallback !== false) {
-			return $englishFallback;
-		}
-		return (string) $fallback;
-	}
-
-	/**
-	 * parses the app data array and enhanced the 'description' value
-	 *
-	 * @param array $data the app data
-	 * @param string $lang
-	 * @return array improved app data
-	 */
-	public static function parseAppInfo(array $data, $lang = null): array {
-		if ($lang && isset($data['name']) && is_array($data['name'])) {
-			$data['name'] = self::findBestL10NOption($data['name'], $lang);
-		}
-		if ($lang && isset($data['summary']) && is_array($data['summary'])) {
-			$data['summary'] = self::findBestL10NOption($data['summary'], $lang);
-		}
-		if ($lang && isset($data['description']) && is_array($data['description'])) {
-			$data['description'] = trim(self::findBestL10NOption($data['description'], $lang));
-		} elseif (isset($data['description']) && is_string($data['description'])) {
-			$data['description'] = trim($data['description']);
-		} else {
-			$data['description'] = '';
-		}
-
-		return $data;
-	}
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IL10N $l
-	 * @param array $info
-	 * @throws \Exception
-	 */
-	public static function checkAppDependencies(\OCP\IConfig $config, \OCP\IL10N $l, array $info, bool $ignoreMax) {
-		$dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
-		$missing = $dependencyAnalyzer->analyze($info, $ignoreMax);
-		if (!empty($missing)) {
-			$missingMsg = implode(PHP_EOL, $missing);
-			throw new \Exception(
-				$l->t('App "%1$s" cannot be installed because the following dependencies are not fulfilled: %2$s',
-					[$info['name'], $missingMsg]
-				)
-			);
-		}
-	}
+    private static $adminForms = [];
+    private static $personalForms = [];
+    private static $appTypes = [];
+    private static $loadedApps = [];
+    private static $altLogin = [];
+    private static $alreadyRegistered = [];
+    public const supportedApp = 300;
+    public const officialApp = 200;
+
+    /**
+     * clean the appId
+     *
+     * @psalm-taint-escape file
+     * @psalm-taint-escape include
+     *
+     * @param string $app AppId that needs to be cleaned
+     * @return string
+     */
+    public static function cleanAppId(string $app): string {
+        return str_replace(['\0', '/', '\\', '..'], '', $app);
+    }
+
+    /**
+     * Check if an app is loaded
+     *
+     * @param string $app
+     * @return bool
+     */
+    public static function isAppLoaded(string $app): bool {
+        return isset(self::$loadedApps[$app]);
+    }
+
+    /**
+     * loads all apps
+     *
+     * @param string[] $types
+     * @return bool
+     *
+     * This function walks through the ownCloud directory and loads all apps
+     * it can find. A directory contains an app if the file /appinfo/info.xml
+     * exists.
+     *
+     * if $types is set to non-empty array, only apps of those types will be loaded
+     */
+    public static function loadApps(array $types = []): bool {
+        if ((bool) \OC::$server->getSystemConfig()->getValue('maintenance', false)) {
+            return false;
+        }
+        // Load the enabled apps here
+        $apps = self::getEnabledApps();
+
+        // Add each apps' folder as allowed class path
+        foreach ($apps as $app) {
+            // If the app is already loaded then autoloading it makes no sense
+            if (!isset(self::$loadedApps[$app])) {
+                $path = self::getAppPath($app);
+                if ($path !== false) {
+                    self::registerAutoloading($app, $path);
+                }
+            }
+        }
+
+        // prevent app.php from printing output
+        ob_start();
+        foreach ($apps as $app) {
+            if (!isset(self::$loadedApps[$app]) && ($types === [] || self::isType($app, $types))) {
+                self::loadApp($app);
+            }
+        }
+        ob_end_clean();
+
+        return true;
+    }
+
+    /**
+     * load a single app
+     *
+     * @param string $app
+     * @throws Exception
+     */
+    public static function loadApp(string $app) {
+        self::$loadedApps[$app] = true;
+        $appPath = self::getAppPath($app);
+        if ($appPath === false) {
+            return;
+        }
+
+        // in case someone calls loadApp() directly
+        self::registerAutoloading($app, $appPath);
+
+        /** @var Coordinator $coordinator */
+        $coordinator = \OC::$server->query(Coordinator::class);
+        $isBootable = $coordinator->isBootable($app);
+
+        $hasAppPhpFile = is_file($appPath . '/appinfo/app.php');
+
+        if ($isBootable && $hasAppPhpFile) {
+            \OC::$server->getLogger()->error('/appinfo/app.php is not loaded when \OCP\AppFramework\Bootstrap\IBootstrap on the application class is used. Migrate everything from app.php to the Application class.', [
+                'app' => $app,
+            ]);
+        } elseif ($hasAppPhpFile) {
+            \OC::$server->getLogger()->debug('/appinfo/app.php is deprecated, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
+                'app' => $app,
+            ]);
+            \OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
+            try {
+                self::requireAppFile($app);
+            } catch (Throwable $ex) {
+                if ($ex instanceof ServerNotAvailableException) {
+                    throw $ex;
+                }
+                if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) {
+                    \OC::$server->getLogger()->logException($ex, [
+                        'message' => "App $app threw an error during app.php load and will be disabled: " . $ex->getMessage(),
+                    ]);
+
+                    // Only disable apps which are not shipped and that are not authentication apps
+                    \OC::$server->getAppManager()->disableApp($app, true);
+                } else {
+                    \OC::$server->getLogger()->logException($ex, [
+                        'message' => "App $app threw an error during app.php load: " . $ex->getMessage(),
+                    ]);
+                }
+            }
+            \OC::$server->getEventLogger()->end('load_app_' . $app);
+        }
+        $coordinator->bootApp($app);
+
+        $info = self::getAppInfo($app);
+        if (!empty($info['activity']['filters'])) {
+            foreach ($info['activity']['filters'] as $filter) {
+                \OC::$server->getActivityManager()->registerFilter($filter);
+            }
+        }
+        if (!empty($info['activity']['settings'])) {
+            foreach ($info['activity']['settings'] as $setting) {
+                \OC::$server->getActivityManager()->registerSetting($setting);
+            }
+        }
+        if (!empty($info['activity']['providers'])) {
+            foreach ($info['activity']['providers'] as $provider) {
+                \OC::$server->getActivityManager()->registerProvider($provider);
+            }
+        }
+
+        if (!empty($info['settings']['admin'])) {
+            foreach ($info['settings']['admin'] as $setting) {
+                \OC::$server->getSettingsManager()->registerSetting('admin', $setting);
+            }
+        }
+        if (!empty($info['settings']['admin-section'])) {
+            foreach ($info['settings']['admin-section'] as $section) {
+                \OC::$server->getSettingsManager()->registerSection('admin', $section);
+            }
+        }
+        if (!empty($info['settings']['personal'])) {
+            foreach ($info['settings']['personal'] as $setting) {
+                \OC::$server->getSettingsManager()->registerSetting('personal', $setting);
+            }
+        }
+        if (!empty($info['settings']['personal-section'])) {
+            foreach ($info['settings']['personal-section'] as $section) {
+                \OC::$server->getSettingsManager()->registerSection('personal', $section);
+            }
+        }
+
+        if (!empty($info['collaboration']['plugins'])) {
+            // deal with one or many plugin entries
+            $plugins = isset($info['collaboration']['plugins']['plugin']['@value']) ?
+                [$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
+            foreach ($plugins as $plugin) {
+                if ($plugin['@attributes']['type'] === 'collaborator-search') {
+                    $pluginInfo = [
+                        'shareType' => $plugin['@attributes']['share-type'],
+                        'class' => $plugin['@value'],
+                    ];
+                    \OC::$server->getCollaboratorSearch()->registerPlugin($pluginInfo);
+                } elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
+                    \OC::$server->getAutoCompleteManager()->registerSorter($plugin['@value']);
+                }
+            }
+        }
+    }
+
+    /**
+     * @internal
+     * @param string $app
+     * @param string $path
+     * @param bool $force
+     */
+    public static function registerAutoloading(string $app, string $path, bool $force = false) {
+        $key = $app . '-' . $path;
+        if (!$force && isset(self::$alreadyRegistered[$key])) {
+            return;
+        }
+
+        self::$alreadyRegistered[$key] = true;
+
+        // Register on PSR-4 composer autoloader
+        $appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
+        \OC::$server->registerNamespace($app, $appNamespace);
+
+        if (file_exists($path . '/composer/autoload.php')) {
+            require_once $path . '/composer/autoload.php';
+        } else {
+            \OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
+            // Register on legacy autoloader
+            \OC::$loader->addValidRoot($path);
+        }
+
+        // Register Test namespace only when testing
+        if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
+            \OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
+        }
+    }
+
+    /**
+     * Load app.php from the given app
+     *
+     * @param string $app app name
+     * @throws Error
+     */
+    private static function requireAppFile(string $app) {
+        // encapsulated here to avoid variable scope conflicts
+        require_once $app . '/appinfo/app.php';
+    }
+
+    /**
+     * check if an app is of a specific type
+     *
+     * @param string $app
+     * @param array $types
+     * @return bool
+     */
+    public static function isType(string $app, array $types): bool {
+        $appTypes = self::getAppTypes($app);
+        foreach ($types as $type) {
+            if (array_search($type, $appTypes) !== false) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * get the types of an app
+     *
+     * @param string $app
+     * @return array
+     */
+    private static function getAppTypes(string $app): array {
+        //load the cache
+        if (count(self::$appTypes) == 0) {
+            self::$appTypes = \OC::$server->getAppConfig()->getValues(false, 'types');
+        }
+
+        if (isset(self::$appTypes[$app])) {
+            return explode(',', self::$appTypes[$app]);
+        }
+
+        return [];
+    }
+
+    /**
+     * read app types from info.xml and cache them in the database
+     */
+    public static function setAppTypes(string $app) {
+        $appManager = \OC::$server->getAppManager();
+        $appData = $appManager->getAppInfo($app);
+        if (!is_array($appData)) {
+            return;
+        }
+
+        if (isset($appData['types'])) {
+            $appTypes = implode(',', $appData['types']);
+        } else {
+            $appTypes = '';
+            $appData['types'] = [];
+        }
+
+        $config = \OC::$server->getConfig();
+        $config->setAppValue($app, 'types', $appTypes);
+
+        if ($appManager->hasProtectedAppType($appData['types'])) {
+            $enabled = $config->getAppValue($app, 'enabled', 'yes');
+            if ($enabled !== 'yes' && $enabled !== 'no') {
+                $config->setAppValue($app, 'enabled', 'yes');
+            }
+        }
+    }
+
+    /**
+     * Returns apps enabled for the current user.
+     *
+     * @param bool $forceRefresh whether to refresh the cache
+     * @param bool $all whether to return apps for all users, not only the
+     * currently logged in one
+     * @return string[]
+     */
+    public static function getEnabledApps(bool $forceRefresh = false, bool $all = false): array {
+        if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
+            return [];
+        }
+        // in incognito mode or when logged out, $user will be false,
+        // which is also the case during an upgrade
+        $appManager = \OC::$server->getAppManager();
+        if ($all) {
+            $user = null;
+        } else {
+            $user = \OC::$server->getUserSession()->getUser();
+        }
+
+        if (is_null($user)) {
+            $apps = $appManager->getInstalledApps();
+        } else {
+            $apps = $appManager->getEnabledAppsForUser($user);
+        }
+        $apps = array_filter($apps, function ($app) {
+            return $app !== 'files';//we add this manually
+        });
+        sort($apps);
+        array_unshift($apps, 'files');
+        return $apps;
+    }
+
+    /**
+     * checks whether or not an app is enabled
+     *
+     * @param string $app app
+     * @return bool
+     * @deprecated 13.0.0 use \OC::$server->getAppManager()->isEnabledForUser($appId)
+     *
+     * This function checks whether or not an app is enabled.
+     */
+    public static function isEnabled(string $app): bool {
+        return \OC::$server->getAppManager()->isEnabledForUser($app);
+    }
+
+    /**
+     * enables an app
+     *
+     * @param string $appId
+     * @param array $groups (optional) when set, only these groups will have access to the app
+     * @throws \Exception
+     * @return void
+     *
+     * This function set an app as enabled in appconfig.
+     */
+    public function enable(string $appId,
+                            array $groups = []) {
+
+        // Check if app is already downloaded
+        /** @var Installer $installer */
+        $installer = \OC::$server->query(Installer::class);
+        $isDownloaded = $installer->isDownloaded($appId);
+
+        if (!$isDownloaded) {
+            $installer->downloadApp($appId);
+        }
+
+        $installer->installApp($appId);
+
+        $appManager = \OC::$server->getAppManager();
+        if ($groups !== []) {
+            $groupManager = \OC::$server->getGroupManager();
+            $groupsList = [];
+            foreach ($groups as $group) {
+                $groupItem = $groupManager->get($group);
+                if ($groupItem instanceof \OCP\IGroup) {
+                    $groupsList[] = $groupManager->get($group);
+                }
+            }
+            $appManager->enableAppForGroups($appId, $groupsList);
+        } else {
+            $appManager->enableApp($appId);
+        }
+    }
+
+    /**
+     * Get the path where to install apps
+     *
+     * @return string|false
+     */
+    public static function getInstallPath() {
+        if (\OC::$server->getSystemConfig()->getValue('appstoreenabled', true) == false) {
+            return false;
+        }
+
+        foreach (OC::$APPSROOTS as $dir) {
+            if (isset($dir['writable']) && $dir['writable'] === true) {
+                return $dir['path'];
+            }
+        }
+
+        \OCP\Util::writeLog('core', 'No application directories are marked as writable.', ILogger::ERROR);
+        return null;
+    }
+
+
+    /**
+     * search for an app in all app-directories
+     *
+     * @param string $appId
+     * @return false|string
+     */
+    public static function findAppInDirectories(string $appId) {
+        $sanitizedAppId = self::cleanAppId($appId);
+        if ($sanitizedAppId !== $appId) {
+            return false;
+        }
+        static $app_dir = [];
+
+        if (isset($app_dir[$appId])) {
+            return $app_dir[$appId];
+        }
+
+        $possibleApps = [];
+        foreach (OC::$APPSROOTS as $dir) {
+            if (file_exists($dir['path'] . '/' . $appId)) {
+                $possibleApps[] = $dir;
+            }
+        }
+
+        if (empty($possibleApps)) {
+            return false;
+        } elseif (count($possibleApps) === 1) {
+            $dir = array_shift($possibleApps);
+            $app_dir[$appId] = $dir;
+            return $dir;
+        } else {
+            $versionToLoad = [];
+            foreach ($possibleApps as $possibleApp) {
+                $version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
+                if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
+                    $versionToLoad = [
+                        'dir' => $possibleApp,
+                        'version' => $version,
+                    ];
+                }
+            }
+            $app_dir[$appId] = $versionToLoad['dir'];
+            return $versionToLoad['dir'];
+            //TODO - write test
+        }
+    }
+
+    /**
+     * Get the directory for the given app.
+     * If the app is defined in multiple directories, the first one is taken. (false if not found)
+     *
+     * @psalm-taint-specialize
+     *
+     * @param string $appId
+     * @return string|false
+     * @deprecated 11.0.0 use \OC::$server->getAppManager()->getAppPath()
+     */
+    public static function getAppPath(string $appId) {
+        if ($appId === null || trim($appId) === '') {
+            return false;
+        }
+
+        if (($dir = self::findAppInDirectories($appId)) != false) {
+            return $dir['path'] . '/' . $appId;
+        }
+        return false;
+    }
+
+    /**
+     * Get the path for the given app on the access
+     * If the app is defined in multiple directories, the first one is taken. (false if not found)
+     *
+     * @param string $appId
+     * @return string|false
+     * @deprecated 18.0.0 use \OC::$server->getAppManager()->getAppWebPath()
+     */
+    public static function getAppWebPath(string $appId) {
+        if (($dir = self::findAppInDirectories($appId)) != false) {
+            return OC::$WEBROOT . $dir['url'] . '/' . $appId;
+        }
+        return false;
+    }
+
+    /**
+     * get the last version of the app from appinfo/info.xml
+     *
+     * @param string $appId
+     * @param bool $useCache
+     * @return string
+     * @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppVersion()
+     */
+    public static function getAppVersion(string $appId, bool $useCache = true): string {
+        return \OC::$server->getAppManager()->getAppVersion($appId, $useCache);
+    }
+
+    /**
+     * get app's version based on it's path
+     *
+     * @param string $path
+     * @return string
+     */
+    public static function getAppVersionByPath(string $path): string {
+        $infoFile = $path . '/appinfo/info.xml';
+        $appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true);
+        return isset($appData['version']) ? $appData['version'] : '';
+    }
+
+
+    /**
+     * Read all app metadata from the info.xml file
+     *
+     * @param string $appId id of the app or the path of the info.xml file
+     * @param bool $path
+     * @param string $lang
+     * @return array|null
+     * @note all data is read from info.xml, not just pre-defined fields
+     * @deprecated 14.0.0 use \OC::$server->getAppManager()->getAppInfo()
+     */
+    public static function getAppInfo(string $appId, bool $path = false, string $lang = null) {
+        return \OC::$server->getAppManager()->getAppInfo($appId, $path, $lang);
+    }
+
+    /**
+     * Returns the navigation
+     *
+     * @return array
+     * @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll()
+     *
+     * This function returns an array containing all entries added. The
+     * entries are sorted by the key 'order' ascending. Additional to the keys
+     * given for each app the following keys exist:
+     *   - active: boolean, signals if the user is on this navigation entry
+     */
+    public static function getNavigation(): array {
+        return OC::$server->getNavigationManager()->getAll();
+    }
+
+    /**
+     * Returns the Settings Navigation
+     *
+     * @return string[]
+     * @deprecated 14.0.0 use \OC::$server->getNavigationManager()->getAll('settings')
+     *
+     * This function returns an array containing all settings pages added. The
+     * entries are sorted by the key 'order' ascending.
+     */
+    public static function getSettingsNavigation(): array {
+        return OC::$server->getNavigationManager()->getAll('settings');
+    }
+
+    /**
+     * get the id of loaded app
+     *
+     * @return string
+     */
+    public static function getCurrentApp(): string {
+        $request = \OC::$server->getRequest();
+        $script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
+        $topFolder = substr($script, 0, strpos($script, '/') ?: 0);
+        if (empty($topFolder)) {
+            $path_info = $request->getPathInfo();
+            if ($path_info) {
+                $topFolder = substr($path_info, 1, strpos($path_info, '/', 1) - 1);
+            }
+        }
+        if ($topFolder == 'apps') {
+            $length = strlen($topFolder);
+            return substr($script, $length + 1, strpos($script, '/', $length + 1) - $length - 1) ?: '';
+        } else {
+            return $topFolder;
+        }
+    }
+
+    /**
+     * @param string $type
+     * @return array
+     */
+    public static function getForms(string $type): array {
+        $forms = [];
+        switch ($type) {
+            case 'admin':
+                $source = self::$adminForms;
+                break;
+            case 'personal':
+                $source = self::$personalForms;
+                break;
+            default:
+                return [];
+        }
+        foreach ($source as $form) {
+            $forms[] = include $form;
+        }
+        return $forms;
+    }
+
+    /**
+     * register an admin form to be shown
+     *
+     * @param string $app
+     * @param string $page
+     */
+    public static function registerAdmin(string $app, string $page) {
+        self::$adminForms[] = $app . '/' . $page . '.php';
+    }
+
+    /**
+     * register a personal form to be shown
+     * @param string $app
+     * @param string $page
+     */
+    public static function registerPersonal(string $app, string $page) {
+        self::$personalForms[] = $app . '/' . $page . '.php';
+    }
+
+    /**
+     * @param array $entry
+     * @deprecated 20.0.0 Please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface
+     */
+    public static function registerLogIn(array $entry) {
+        \OC::$server->getLogger()->debug('OC_App::registerLogIn() is deprecated, please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface');
+        self::$altLogin[] = $entry;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getAlternativeLogIns(): array {
+        /** @var Coordinator $bootstrapCoordinator */
+        $bootstrapCoordinator = \OC::$server->query(Coordinator::class);
+
+        foreach ($bootstrapCoordinator->getRegistrationContext()->getAlternativeLogins() as $registration) {
+            if (!in_array(IAlternativeLogin::class, class_implements($registration->getService()), true)) {
+                \OC::$server->getLogger()->error('Alternative login option {option} does not implement {interface} and is therefore ignored.', [
+                    'option' => $registration->getService(),
+                    'interface' => IAlternativeLogin::class,
+                    'app' => $registration->getAppId(),
+                ]);
+                continue;
+            }
+
+            try {
+                /** @var IAlternativeLogin $provider */
+                $provider = \OC::$server->query($registration->getService());
+            } catch (QueryException $e) {
+                \OC::$server->getLogger()->logException($e, [
+                    'message' => 'Alternative login option {option} can not be initialised.',
+                    'option' => $registration->getService(),
+                    'app' => $registration->getAppId(),
+                ]);
+            }
+
+            try {
+                $provider->load();
+
+                self::$altLogin[] = [
+                    'name' => $provider->getLabel(),
+                    'href' => $provider->getLink(),
+                    'style' => $provider->getClass(),
+                ];
+            } catch (Throwable $e) {
+                \OC::$server->getLogger()->logException($e, [
+                    'message' => 'Alternative login option {option} had an error while loading.',
+                    'option' => $registration->getService(),
+                    'app' => $registration->getAppId(),
+                ]);
+            }
+        }
+
+        return self::$altLogin;
+    }
+
+    /**
+     * get a list of all apps in the apps folder
+     *
+     * @return string[] an array of app names (string IDs)
+     * @todo: change the name of this method to getInstalledApps, which is more accurate
+     */
+    public static function getAllApps(): array {
+        $apps = [];
+
+        foreach (OC::$APPSROOTS as $apps_dir) {
+            if (!is_readable($apps_dir['path'])) {
+                \OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], ILogger::WARN);
+                continue;
+            }
+            $dh = opendir($apps_dir['path']);
+
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) {
+                        $apps[] = $file;
+                    }
+                }
+            }
+        }
+
+        $apps = array_unique($apps);
+
+        return $apps;
+    }
+
+    /**
+     * List all apps, this is used in apps.php
+     *
+     * @return array
+     */
+    public function listAllApps(): array {
+        $installedApps = OC_App::getAllApps();
+
+        $appManager = \OC::$server->getAppManager();
+        //we don't want to show configuration for these
+        $blacklist = $appManager->getAlwaysEnabledApps();
+        $appList = [];
+        $langCode = \OC::$server->getL10N('core')->getLanguageCode();
+        $urlGenerator = \OC::$server->getURLGenerator();
+        /** @var \OCP\Support\Subscription\IRegistry $subscriptionRegistry */
+        $subscriptionRegistry = \OC::$server->query(\OCP\Support\Subscription\IRegistry::class);
+        $supportedApps = $subscriptionRegistry->delegateGetSupportedApps();
+
+        foreach ($installedApps as $app) {
+            if (array_search($app, $blacklist) === false) {
+                $info = OC_App::getAppInfo($app, false, $langCode);
+                if (!is_array($info)) {
+                    \OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', ILogger::ERROR);
+                    continue;
+                }
+
+                if (!isset($info['name'])) {
+                    \OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', ILogger::ERROR);
+                    continue;
+                }
+
+                $enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'no');
+                $info['groups'] = null;
+                if ($enabled === 'yes') {
+                    $active = true;
+                } elseif ($enabled === 'no') {
+                    $active = false;
+                } else {
+                    $active = true;
+                    $info['groups'] = $enabled;
+                }
+
+                $info['active'] = $active;
+
+                if ($appManager->isShipped($app)) {
+                    $info['internal'] = true;
+                    $info['level'] = self::officialApp;
+                    $info['removable'] = false;
+                } else {
+                    $info['internal'] = false;
+                    $info['removable'] = true;
+                }
+
+                if (in_array($app, $supportedApps)) {
+                    $info['level'] = self::supportedApp;
+                }
+
+                $appPath = self::getAppPath($app);
+                if ($appPath !== false) {
+                    $appIcon = $appPath . '/img/' . $app . '.svg';
+                    if (file_exists($appIcon)) {
+                        $info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
+                        $info['previewAsIcon'] = true;
+                    } else {
+                        $appIcon = $appPath . '/img/app.svg';
+                        if (file_exists($appIcon)) {
+                            $info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
+                            $info['previewAsIcon'] = true;
+                        }
+                    }
+                }
+                // fix documentation
+                if (isset($info['documentation']) && is_array($info['documentation'])) {
+                    foreach ($info['documentation'] as $key => $url) {
+                        // If it is not an absolute URL we assume it is a key
+                        // i.e. admin-ldap will get converted to go.php?to=admin-ldap
+                        if (stripos($url, 'https://') !== 0 && stripos($url, 'http://') !== 0) {
+                            $url = $urlGenerator->linkToDocs($url);
+                        }
+
+                        $info['documentation'][$key] = $url;
+                    }
+                }
+
+                $info['version'] = OC_App::getAppVersion($app);
+                $appList[] = $info;
+            }
+        }
+
+        return $appList;
+    }
+
+    public static function shouldUpgrade(string $app): bool {
+        $versions = self::getAppVersions();
+        $currentVersion = OC_App::getAppVersion($app);
+        if ($currentVersion && isset($versions[$app])) {
+            $installedVersion = $versions[$app];
+            if (!version_compare($currentVersion, $installedVersion, '=')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Adjust the number of version parts of $version1 to match
+     * the number of version parts of $version2.
+     *
+     * @param string $version1 version to adjust
+     * @param string $version2 version to take the number of parts from
+     * @return string shortened $version1
+     */
+    private static function adjustVersionParts(string $version1, string $version2): string {
+        $version1 = explode('.', $version1);
+        $version2 = explode('.', $version2);
+        // reduce $version1 to match the number of parts in $version2
+        while (count($version1) > count($version2)) {
+            array_pop($version1);
+        }
+        // if $version1 does not have enough parts, add some
+        while (count($version1) < count($version2)) {
+            $version1[] = '0';
+        }
+        return implode('.', $version1);
+    }
+
+    /**
+     * Check whether the current ownCloud version matches the given
+     * application's version requirements.
+     *
+     * The comparison is made based on the number of parts that the
+     * app info version has. For example for ownCloud 6.0.3 if the
+     * app info version is expecting version 6.0, the comparison is
+     * made on the first two parts of the ownCloud version.
+     * This means that it's possible to specify "requiremin" => 6
+     * and "requiremax" => 6 and it will still match ownCloud 6.0.3.
+     *
+     * @param string $ocVersion ownCloud version to check against
+     * @param array $appInfo app info (from xml)
+     *
+     * @return boolean true if compatible, otherwise false
+     */
+    public static function isAppCompatible(string $ocVersion, array $appInfo, bool $ignoreMax = false): bool {
+        $requireMin = '';
+        $requireMax = '';
+        if (isset($appInfo['dependencies']['nextcloud']['@attributes']['min-version'])) {
+            $requireMin = $appInfo['dependencies']['nextcloud']['@attributes']['min-version'];
+        } elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) {
+            $requireMin = $appInfo['dependencies']['owncloud']['@attributes']['min-version'];
+        } elseif (isset($appInfo['requiremin'])) {
+            $requireMin = $appInfo['requiremin'];
+        } elseif (isset($appInfo['require'])) {
+            $requireMin = $appInfo['require'];
+        }
+
+        if (isset($appInfo['dependencies']['nextcloud']['@attributes']['max-version'])) {
+            $requireMax = $appInfo['dependencies']['nextcloud']['@attributes']['max-version'];
+        } elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) {
+            $requireMax = $appInfo['dependencies']['owncloud']['@attributes']['max-version'];
+        } elseif (isset($appInfo['requiremax'])) {
+            $requireMax = $appInfo['requiremax'];
+        }
+
+        if (!empty($requireMin)
+            && version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<')
+        ) {
+            return false;
+        }
+
+        if (!$ignoreMax && !empty($requireMax)
+            && version_compare(self::adjustVersionParts($ocVersion, $requireMax), $requireMax, '>')
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * get the installed version of all apps
+     */
+    public static function getAppVersions() {
+        static $versions;
+
+        if (!$versions) {
+            $appConfig = \OC::$server->getAppConfig();
+            $versions = $appConfig->getValues(false, 'installed_version');
+        }
+        return $versions;
+    }
+
+    /**
+     * update the database for the app and call the update script
+     *
+     * @param string $appId
+     * @return bool
+     */
+    public static function updateApp(string $appId): bool {
+        $appPath = self::getAppPath($appId);
+        if ($appPath === false) {
+            return false;
+        }
+
+        if (is_file($appPath . '/appinfo/database.xml')) {
+            \OC::$server->getLogger()->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+            return false;
+        }
+
+        \OC::$server->getAppManager()->clearAppsCache();
+        $appData = self::getAppInfo($appId);
+
+        $ignoreMaxApps = \OC::$server->getConfig()->getSystemValue('app_install_overwrite', []);
+        $ignoreMax = in_array($appId, $ignoreMaxApps, true);
+        \OC_App::checkAppDependencies(
+            \OC::$server->getConfig(),
+            \OC::$server->getL10N('core'),
+            $appData,
+            $ignoreMax
+        );
+
+        self::registerAutoloading($appId, $appPath, true);
+        self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
+
+        $ms = new MigrationService($appId, \OC::$server->get(\OC\DB\Connection::class));
+        $ms->migrate();
+
+        self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
+        self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']);
+        // update appversion in app manager
+        \OC::$server->getAppManager()->clearAppsCache();
+        \OC::$server->getAppManager()->getAppVersion($appId, false);
+
+        self::setupBackgroundJobs($appData['background-jobs']);
+
+        //set remote/public handlers
+        if (array_key_exists('ocsid', $appData)) {
+            \OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
+        } elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
+            \OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
+        }
+        foreach ($appData['remote'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+        }
+        foreach ($appData['public'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+        }
+
+        self::setAppTypes($appId);
+
+        $version = \OC_App::getAppVersion($appId);
+        \OC::$server->getConfig()->setAppValue($appId, 'installed_version', $version);
+
+        \OC::$server->getEventDispatcher()->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_UPDATE, $appId
+        ));
+
+        return true;
+    }
+
+    /**
+     * @param string $appId
+     * @param string[] $steps
+     * @throws \OC\NeedsUpdateException
+     */
+    public static function executeRepairSteps(string $appId, array $steps) {
+        if (empty($steps)) {
+            return;
+        }
+        // load the app
+        self::loadApp($appId);
+
+        $dispatcher = OC::$server->getEventDispatcher();
+
+        // load the steps
+        $r = new Repair([], $dispatcher, \OC::$server->get(LoggerInterface::class));
+        foreach ($steps as $step) {
+            try {
+                $r->addStep($step);
+            } catch (Exception $ex) {
+                $r->emit('\OC\Repair', 'error', [$ex->getMessage()]);
+                \OC::$server->getLogger()->logException($ex);
+            }
+        }
+        // run the steps
+        $r->run();
+    }
+
+    public static function setupBackgroundJobs(array $jobs) {
+        $queue = \OC::$server->getJobList();
+        foreach ($jobs as $job) {
+            $queue->add($job);
+        }
+    }
+
+    /**
+     * @param string $appId
+     * @param string[] $steps
+     */
+    private static function setupLiveMigrations(string $appId, array $steps) {
+        $queue = \OC::$server->getJobList();
+        foreach ($steps as $step) {
+            $queue->add('OC\Migration\BackgroundRepair', [
+                'app' => $appId,
+                'step' => $step]);
+        }
+    }
+
+    /**
+     * @param string $appId
+     * @return \OC\Files\View|false
+     */
+    public static function getStorage(string $appId) {
+        if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
+            if (\OC::$server->getUserSession()->isLoggedIn()) {
+                $view = new \OC\Files\View('/' . OC_User::getUser());
+                if (!$view->file_exists($appId)) {
+                    $view->mkdir($appId);
+                }
+                return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
+            } else {
+                \OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', ILogger::ERROR);
+                return false;
+            }
+        } else {
+            \OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', ILogger::ERROR);
+            return false;
+        }
+    }
+
+    protected static function findBestL10NOption(array $options, string $lang): string {
+        // only a single option
+        if (isset($options['@value'])) {
+            return $options['@value'];
+        }
+
+        $fallback = $similarLangFallback = $englishFallback = false;
+
+        $lang = strtolower($lang);
+        $similarLang = $lang;
+        if (strpos($similarLang, '_')) {
+            // For "de_DE" we want to find "de" and the other way around
+            $similarLang = substr($lang, 0, strpos($lang, '_'));
+        }
+
+        foreach ($options as $option) {
+            if (is_array($option)) {
+                if ($fallback === false) {
+                    $fallback = $option['@value'];
+                }
+
+                if (!isset($option['@attributes']['lang'])) {
+                    continue;
+                }
+
+                $attributeLang = strtolower($option['@attributes']['lang']);
+                if ($attributeLang === $lang) {
+                    return $option['@value'];
+                }
+
+                if ($attributeLang === $similarLang) {
+                    $similarLangFallback = $option['@value'];
+                } elseif (strpos($attributeLang, $similarLang . '_') === 0) {
+                    if ($similarLangFallback === false) {
+                        $similarLangFallback = $option['@value'];
+                    }
+                }
+            } else {
+                $englishFallback = $option;
+            }
+        }
+
+        if ($similarLangFallback !== false) {
+            return $similarLangFallback;
+        } elseif ($englishFallback !== false) {
+            return $englishFallback;
+        }
+        return (string) $fallback;
+    }
+
+    /**
+     * parses the app data array and enhanced the 'description' value
+     *
+     * @param array $data the app data
+     * @param string $lang
+     * @return array improved app data
+     */
+    public static function parseAppInfo(array $data, $lang = null): array {
+        if ($lang && isset($data['name']) && is_array($data['name'])) {
+            $data['name'] = self::findBestL10NOption($data['name'], $lang);
+        }
+        if ($lang && isset($data['summary']) && is_array($data['summary'])) {
+            $data['summary'] = self::findBestL10NOption($data['summary'], $lang);
+        }
+        if ($lang && isset($data['description']) && is_array($data['description'])) {
+            $data['description'] = trim(self::findBestL10NOption($data['description'], $lang));
+        } elseif (isset($data['description']) && is_string($data['description'])) {
+            $data['description'] = trim($data['description']);
+        } else {
+            $data['description'] = '';
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IL10N $l
+     * @param array $info
+     * @throws \Exception
+     */
+    public static function checkAppDependencies(\OCP\IConfig $config, \OCP\IL10N $l, array $info, bool $ignoreMax) {
+        $dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
+        $missing = $dependencyAnalyzer->analyze($info, $ignoreMax);
+        if (!empty($missing)) {
+            $missingMsg = implode(PHP_EOL, $missing);
+            throw new \Exception(
+                $l->t('App "%1$s" cannot be installed because the following dependencies are not fulfilled: %2$s',
+                    [$info['name'], $missingMsg]
+                )
+            );
+        }
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -163,7 +163,7 @@ 
 		$coordinator = \OC::$server->query(Coordinator::class);
 		$isBootable = $coordinator->isBootable($app);
 
-		$hasAppPhpFile = is_file($appPath . '/appinfo/app.php');
+		$hasAppPhpFile = is_file($appPath.'/appinfo/app.php');
 
 		if ($isBootable && $hasAppPhpFile) {
 			\OC::$server->getLogger()->error('/appinfo/app.php is not loaded when \OCP\AppFramework\Bootstrap\IBootstrap on the application class is used. Migrate everything from app.php to the Application class.', [
@@ -173,7 +173,7 @@ 
 			\OC::$server->getLogger()->debug('/appinfo/app.php is deprecated, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
 				'app' => $app,
 			]);
-			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
+			\OC::$server->getEventLogger()->start('load_app_'.$app, 'Load app: '.$app);
 			try {
 				self::requireAppFile($app);
 			} catch (Throwable $ex) {
@@ -182,18 +182,18 @@ 
 				}
 				if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) {
 					\OC::$server->getLogger()->logException($ex, [
-						'message' => "App $app threw an error during app.php load and will be disabled: " . $ex->getMessage(),
+						'message' => "App $app threw an error during app.php load and will be disabled: ".$ex->getMessage(),
 					]);
 
 					// Only disable apps which are not shipped and that are not authentication apps
 					\OC::$server->getAppManager()->disableApp($app, true);
 				} else {
 					\OC::$server->getLogger()->logException($ex, [
-						'message' => "App $app threw an error during app.php load: " . $ex->getMessage(),
+						'message' => "App $app threw an error during app.php load: ".$ex->getMessage(),
 					]);
 				}
 			}
-			\OC::$server->getEventLogger()->end('load_app_' . $app);
+			\OC::$server->getEventLogger()->end('load_app_'.$app);
 		}
 		$coordinator->bootApp($app);
 
@@ -260,7 +260,7 @@ 
 	 * @param bool $force
 	 */
 	public static function registerAutoloading(string $app, string $path, bool $force = false) {
-		$key = $app . '-' . $path;
+		$key = $app.'-'.$path;
 		if (!$force && isset(self::$alreadyRegistered[$key])) {
 			return;
 		}
@@ -271,17 +271,17 @@ 
 		$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
 		\OC::$server->registerNamespace($app, $appNamespace);
 
-		if (file_exists($path . '/composer/autoload.php')) {
-			require_once $path . '/composer/autoload.php';
+		if (file_exists($path.'/composer/autoload.php')) {
+			require_once $path.'/composer/autoload.php';
 		} else {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
+			\OC::$composerAutoloader->addPsr4($appNamespace.'\\', $path.'/lib/', true);
 			// Register on legacy autoloader
 			\OC::$loader->addValidRoot($path);
 		}
 
 		// Register Test namespace only when testing
 		if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
+			\OC::$composerAutoloader->addPsr4($appNamespace.'\\Tests\\', $path.'/tests/', true);
 		}
 	}
 
@@ -293,7 +293,7 @@ 
 	 */
 	private static function requireAppFile(string $app) {
 		// encapsulated here to avoid variable scope conflicts
-		require_once $app . '/appinfo/app.php';
+		require_once $app.'/appinfo/app.php';
 	}
 
 	/**
@@ -386,8 +386,8 @@ 
 		} else {
 			$apps = $appManager->getEnabledAppsForUser($user);
 		}
-		$apps = array_filter($apps, function ($app) {
-			return $app !== 'files';//we add this manually
+		$apps = array_filter($apps, function($app) {
+			return $app !== 'files'; //we add this manually
 		});
 		sort($apps);
 		array_unshift($apps, 'files');
@@ -487,7 +487,7 @@ 
 
 		$possibleApps = [];
 		foreach (OC::$APPSROOTS as $dir) {
-			if (file_exists($dir['path'] . '/' . $appId)) {
+			if (file_exists($dir['path'].'/'.$appId)) {
 				$possibleApps[] = $dir;
 			}
 		}
@@ -501,7 +501,7 @@ 
 		} else {
 			$versionToLoad = [];
 			foreach ($possibleApps as $possibleApp) {
-				$version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
+				$version = self::getAppVersionByPath($possibleApp['path'].'/'.$appId);
 				if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
 					$versionToLoad = [
 						'dir' => $possibleApp,
@@ -531,7 +531,7 @@ 
 		}
 
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return $dir['path'] . '/' . $appId;
+			return $dir['path'].'/'.$appId;
 		}
 		return false;
 	}
@@ -546,7 +546,7 @@ 
 	 */
 	public static function getAppWebPath(string $appId) {
 		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return OC::$WEBROOT . $dir['url'] . '/' . $appId;
+			return OC::$WEBROOT.$dir['url'].'/'.$appId;
 		}
 		return false;
 	}
@@ -570,7 +570,7 @@ 
 	 * @return string
 	 */
 	public static function getAppVersionByPath(string $path): string {
-		$infoFile = $path . '/appinfo/info.xml';
+		$infoFile = $path.'/appinfo/info.xml';
 		$appData = \OC::$server->getAppManager()->getAppInfo($infoFile, true);
 		return isset($appData['version']) ? $appData['version'] : '';
 	}
@@ -670,7 +670,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerAdmin(string $app, string $page) {
-		self::$adminForms[] = $app . '/' . $page . '.php';
+		self::$adminForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -679,7 +679,7 @@ 
 	 * @param string $page
 	 */
 	public static function registerPersonal(string $app, string $page) {
-		self::$personalForms[] = $app . '/' . $page . '.php';
+		self::$personalForms[] = $app.'/'.$page.'.php';
 	}
 
 	/**
@@ -750,14 +750,14 @@ 
 
 		foreach (OC::$APPSROOTS as $apps_dir) {
 			if (!is_readable($apps_dir['path'])) {
-				\OCP\Util::writeLog('core', 'unable to read app folder : ' . $apps_dir['path'], ILogger::WARN);
+				\OCP\Util::writeLog('core', 'unable to read app folder : '.$apps_dir['path'], ILogger::WARN);
 				continue;
 			}
 			$dh = opendir($apps_dir['path']);
 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
-					if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) {
+					if ($file[0] != '.' and is_dir($apps_dir['path'].'/'.$file) and is_file($apps_dir['path'].'/'.$file.'/appinfo/info.xml')) {
 						$apps[] = $file;
 					}
 				}
@@ -791,12 +791,12 @@ 
 			if (array_search($app, $blacklist) === false) {
 				$info = OC_App::getAppInfo($app, false, $langCode);
 				if (!is_array($info)) {
-					\OCP\Util::writeLog('core', 'Could not read app info file for app "' . $app . '"', ILogger::ERROR);
+					\OCP\Util::writeLog('core', 'Could not read app info file for app "'.$app.'"', ILogger::ERROR);
 					continue;
 				}
 
 				if (!isset($info['name'])) {
-					\OCP\Util::writeLog('core', 'App id "' . $app . '" has no name in appinfo', ILogger::ERROR);
+					\OCP\Util::writeLog('core', 'App id "'.$app.'" has no name in appinfo', ILogger::ERROR);
 					continue;
 				}
 
@@ -828,12 +828,12 @@ 
 
 				$appPath = self::getAppPath($app);
 				if ($appPath !== false) {
-					$appIcon = $appPath . '/img/' . $app . '.svg';
+					$appIcon = $appPath.'/img/'.$app.'.svg';
 					if (file_exists($appIcon)) {
-						$info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
+						$info['preview'] = $urlGenerator->imagePath($app, $app.'.svg');
 						$info['previewAsIcon'] = true;
 					} else {
-						$appIcon = $appPath . '/img/app.svg';
+						$appIcon = $appPath.'/img/app.svg';
 						if (file_exists($appIcon)) {
 							$info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
 							$info['previewAsIcon'] = true;
@@ -972,8 +972,8 @@ 
 			return false;
 		}
 
-		if (is_file($appPath . '/appinfo/database.xml')) {
-			\OC::$server->getLogger()->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+		if (is_file($appPath.'/appinfo/database.xml')) {
+			\OC::$server->getLogger()->error('The appinfo/database.xml file is not longer supported. Used in '.$appId);
 			return false;
 		}
 
@@ -1010,10 +1010,10 @@ 
 			\OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
 		}
 		foreach ($appData['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $appId.'/'.$path);
 		}
 		foreach ($appData['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $appId.'/'.$path);
 		}
 
 		self::setAppTypes($appId);
@@ -1083,17 +1083,17 @@ 
 	public static function getStorage(string $appId) {
 		if (\OC::$server->getAppManager()->isEnabledForUser($appId)) { //sanity check
 			if (\OC::$server->getUserSession()->isLoggedIn()) {
-				$view = new \OC\Files\View('/' . OC_User::getUser());
+				$view = new \OC\Files\View('/'.OC_User::getUser());
 				if (!$view->file_exists($appId)) {
 					$view->mkdir($appId);
 				}
-				return new \OC\Files\View('/' . OC_User::getUser() . '/' . $appId);
+				return new \OC\Files\View('/'.OC_User::getUser().'/'.$appId);
 			} else {
-				\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ', user not logged in', ILogger::ERROR);
+				\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.', user not logged in', ILogger::ERROR);
 				return false;
 			}
 		} else {
-			\OCP\Util::writeLog('core', 'Can\'t get app storage, app ' . $appId . ' not enabled', ILogger::ERROR);
+			\OCP\Util::writeLog('core', 'Can\'t get app storage, app '.$appId.' not enabled', ILogger::ERROR);
 			return false;
 		}
 	}
@@ -1130,7 +1130,7 @@ 
 
 				if ($attributeLang === $similarLang) {
 					$similarLangFallback = $option['@value'];
-				} elseif (strpos($attributeLang, $similarLang . '_') === 0) {
+				} elseif (strpos($attributeLang, $similarLang.'_') === 0) {
 					if ($similarLangFallback === false) {
 						$similarLangFallback = $option['@value'];
 					}