Inspection of "Merge pull request #22331 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( ed1f89...987f62 )

by Roeland

created 2020-08-20 17:46 UTC

Status

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

@@ -49,143 +49,143 @@
 block discarded – undo
 $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->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
-	$application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
-	$application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
-	$application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager(), \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->getConfig(),
-		\OC::$server->getEventDispatcher(),
-		\OC::$server->getAppManager()
-	));
-
-	$application->add(\OC::$server->query(\OC\Core\Command\Preview\Repair::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\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\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
-	$application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
-	$application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
-	$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->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
+    $application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
+    $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager()));
+    $application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
+    $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager(), \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->getConfig(),
+        \OC::$server->getEventDispatcher(),
+        \OC::$server->getAppManager()
+    ));
+
+    $application->add(\OC::$server->query(\OC\Core\Command\Preview\Repair::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\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\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
+    $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
+    $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
+    $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));
 }

Please login to merge, or discard this patch.

core/Command/Maintenance/Install.php 1 patch

Indentation +162 added lines, -162 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

apps/settings/lib/Controller/CheckSetupController.php 1 patch

Indentation +652 added lines, -652 removed lines patch added patch discarded remove patch

@@ -74,292 +74,292 @@  discard block
 block discarded – undo
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class CheckSetupController extends Controller {
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
-	/** @var Checker */
-	private $checker;
-	/** @var ILogger */
-	private $logger;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var IDBConnection|Connection */
-	private $db;
-	/** @var ILockingProvider */
-	private $lockingProvider;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-	/** @var MemoryInfo */
-	private $memoryInfo;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IniGetWrapper */
-	private $iniGetWrapper;
-
-	public function __construct($AppName,
-								IRequest $request,
-								IConfig $config,
-								IClientService $clientService,
-								IURLGenerator $urlGenerator,
-								IL10N $l10n,
-								Checker $checker,
-								ILogger $logger,
-								EventDispatcherInterface $dispatcher,
-								IDBConnection $db,
-								ILockingProvider $lockingProvider,
-								IDateTimeFormatter $dateTimeFormatter,
-								MemoryInfo $memoryInfo,
-								ISecureRandom $secureRandom,
-								IniGetWrapper $iniGetWrapper) {
-		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->checker = $checker;
-		$this->logger = $logger;
-		$this->dispatcher = $dispatcher;
-		$this->db = $db;
-		$this->lockingProvider = $lockingProvider;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-		$this->memoryInfo = $memoryInfo;
-		$this->secureRandom = $secureRandom;
-		$this->iniGetWrapper = $iniGetWrapper;
-	}
-
-	/**
-	 * Checks if the server can connect to the internet using HTTPS and HTTP
-	 * @return bool
-	 */
-	private function hasInternetConnectivityProblems(): bool {
-		if ($this->config->getSystemValue('has_internet_connection', true) === false) {
-			return false;
-		}
-
-		$siteArray = $this->config->getSystemValue('connectivity_check_domains', [
-			'www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org'
-		]);
-
-		foreach ($siteArray as $site) {
-			if ($this->isSiteReachable($site)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
-	 * @return bool
-	 */
-	private function isSiteReachable($sitename) {
-		$httpSiteName = 'http://' . $sitename . '/';
-		$httpsSiteName = 'https://' . $sitename . '/';
-
-		try {
-			$client = $this->clientService->newClient();
-			$client->get($httpSiteName);
-			$client->get($httpsSiteName);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'internet_connection_check']);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Checks whether a local memcache is installed or not
-	 * @return bool
-	 */
-	private function isMemcacheConfigured() {
-		return $this->config->getSystemValue('memcache.local', null) !== null;
-	}
-
-	/**
-	 * Whether PHP can generate "secure" pseudorandom integers
-	 *
-	 * @return bool
-	 */
-	private function isRandomnessSecure() {
-		try {
-			$this->secureRandom->generate(1);
-		} catch (\Exception $ex) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Public for the sake of unit-testing
-	 *
-	 * @return array
-	 */
-	protected function getCurlVersion() {
-		return curl_version();
-	}
-
-	/**
-	 * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
-	 * have multiple bugs which likely lead to problems in combination with
-	 * functionality required by ownCloud such as SNI.
-	 *
-	 * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
-	 * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
-	 * @return string
-	 */
-	private function isUsedTlsLibOutdated() {
-		// Don't run check when:
-		// 1. Server has `has_internet_connection` set to false
-		// 2. AppStore AND S2S is disabled
-		if (!$this->config->getSystemValue('has_internet_connection', true)) {
-			return '';
-		}
-		if (!$this->config->getSystemValue('appstoreenabled', true)
-			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
-			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
-			return '';
-		}
-
-		$versionString = $this->getCurlVersion();
-		if (isset($versionString['ssl_version'])) {
-			$versionString = $versionString['ssl_version'];
-		} else {
-			return '';
-		}
-
-		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if (!$this->config->getSystemValue('appstoreenabled', true)) {
-			$features = (string)$this->l10n->t('Federated Cloud Sharing');
-		}
-
-		// Check if at least OpenSSL after 1.01d or 1.0.2b
-		if (strpos($versionString, 'OpenSSL/') === 0) {
-			$majorVersion = substr($versionString, 8, 5);
-			$patchRelease = substr($versionString, 13, 6);
-
-			if (($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
-				($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
-				return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['OpenSSL', $versionString, $features]);
-			}
-		}
-
-		// Check if NSS and perform heuristic check
-		if (strpos($versionString, 'NSS/') === 0) {
-			try {
-				$firstClient = $this->clientService->newClient();
-				$firstClient->get('https://nextcloud.com/');
-
-				$secondClient = $this->clientService->newClient();
-				$secondClient->get('https://nextcloud.com/');
-			} catch (ClientException $e) {
-				if ($e->getResponse()->getStatusCode() === 400) {
-					return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]);
-				}
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * Whether the version is outdated
-	 *
-	 * @return bool
-	 */
-	protected function isPhpOutdated(): bool {
-		return PHP_VERSION_ID < 70300;
-	}
-
-	/**
-	 * Whether the php version is still supported (at time of release)
-	 * according to: https://secure.php.net/supported-versions.php
-	 *
-	 * @return array
-	 */
-	private function isPhpSupported(): array {
-		return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
-	}
-
-	/**
-	 * Check if the reverse proxy configuration is working as expected
-	 *
-	 * @return bool
-	 */
-	private function forwardedForHeadersWorking() {
-		$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
-		$remoteAddress = $this->request->getHeader('REMOTE_ADDR');
-
-		if (empty($trustedProxies) && $this->request->getHeader('X-Forwarded-Host') !== '') {
-			return false;
-		}
-
-		if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true)) {
-			return $remoteAddress !== $this->request->getRemoteAddress();
-		}
-
-		// either not enabled or working correctly
-		return true;
-	}
-
-	/**
-	 * Checks if the correct memcache module for PHP is installed. Only
-	 * fails if memcached is configured and the working module is not installed.
-	 *
-	 * @return bool
-	 */
-	private function isCorrectMemcachedPHPModuleInstalled() {
-		if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
-			return true;
-		}
-
-		// there are two different memcached modules for PHP
-		// we only support memcached and not memcache
-		// https://code.google.com/p/memcached/wiki/PHPClientComparison
-		return !(!extension_loaded('memcached') && extension_loaded('memcache'));
-	}
-
-	/**
-	 * Checks if set_time_limit is not disabled.
-	 *
-	 * @return bool
-	 */
-	private function isSettimelimitAvailable() {
-		if (function_exists('set_time_limit')
-			&& strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return RedirectResponse
-	 */
-	public function rescanFailedIntegrityCheck() {
-		$this->checker->runInstanceVerification();
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview'])
-		);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @return DataResponse
-	 */
-	public function getFailedIntegrityCheckFiles() {
-		if (!$this->checker->isCodeCheckEnforced()) {
-			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
-		}
-
-		$completeResults = $this->checker->getResults();
-
-		if (!empty($completeResults)) {
-			$formattedTextResponse = 'Technical information
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
+    /** @var Checker */
+    private $checker;
+    /** @var ILogger */
+    private $logger;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var IDBConnection|Connection */
+    private $db;
+    /** @var ILockingProvider */
+    private $lockingProvider;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+    /** @var MemoryInfo */
+    private $memoryInfo;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IniGetWrapper */
+    private $iniGetWrapper;
+
+    public function __construct($AppName,
+                                IRequest $request,
+                                IConfig $config,
+                                IClientService $clientService,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l10n,
+                                Checker $checker,
+                                ILogger $logger,
+                                EventDispatcherInterface $dispatcher,
+                                IDBConnection $db,
+                                ILockingProvider $lockingProvider,
+                                IDateTimeFormatter $dateTimeFormatter,
+                                MemoryInfo $memoryInfo,
+                                ISecureRandom $secureRandom,
+                                IniGetWrapper $iniGetWrapper) {
+        parent::__construct($AppName, $request);
+        $this->config = $config;
+        $this->clientService = $clientService;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->checker = $checker;
+        $this->logger = $logger;
+        $this->dispatcher = $dispatcher;
+        $this->db = $db;
+        $this->lockingProvider = $lockingProvider;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+        $this->memoryInfo = $memoryInfo;
+        $this->secureRandom = $secureRandom;
+        $this->iniGetWrapper = $iniGetWrapper;
+    }
+
+    /**
+     * Checks if the server can connect to the internet using HTTPS and HTTP
+     * @return bool
+     */
+    private function hasInternetConnectivityProblems(): bool {
+        if ($this->config->getSystemValue('has_internet_connection', true) === false) {
+            return false;
+        }
+
+        $siteArray = $this->config->getSystemValue('connectivity_check_domains', [
+            'www.nextcloud.com', 'www.startpage.com', 'www.eff.org', 'www.edri.org'
+        ]);
+
+        foreach ($siteArray as $site) {
+            if ($this->isSiteReachable($site)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Checks if the Nextcloud server can connect to a specific URL using both HTTPS and HTTP
+     * @return bool
+     */
+    private function isSiteReachable($sitename) {
+        $httpSiteName = 'http://' . $sitename . '/';
+        $httpsSiteName = 'https://' . $sitename . '/';
+
+        try {
+            $client = $this->clientService->newClient();
+            $client->get($httpSiteName);
+            $client->get($httpsSiteName);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'internet_connection_check']);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Checks whether a local memcache is installed or not
+     * @return bool
+     */
+    private function isMemcacheConfigured() {
+        return $this->config->getSystemValue('memcache.local', null) !== null;
+    }
+
+    /**
+     * Whether PHP can generate "secure" pseudorandom integers
+     *
+     * @return bool
+     */
+    private function isRandomnessSecure() {
+        try {
+            $this->secureRandom->generate(1);
+        } catch (\Exception $ex) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Public for the sake of unit-testing
+     *
+     * @return array
+     */
+    protected function getCurlVersion() {
+        return curl_version();
+    }
+
+    /**
+     * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
+     * have multiple bugs which likely lead to problems in combination with
+     * functionality required by ownCloud such as SNI.
+     *
+     * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
+     * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
+     * @return string
+     */
+    private function isUsedTlsLibOutdated() {
+        // Don't run check when:
+        // 1. Server has `has_internet_connection` set to false
+        // 2. AppStore AND S2S is disabled
+        if (!$this->config->getSystemValue('has_internet_connection', true)) {
+            return '';
+        }
+        if (!$this->config->getSystemValue('appstoreenabled', true)
+            && $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
+            && $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
+            return '';
+        }
+
+        $versionString = $this->getCurlVersion();
+        if (isset($versionString['ssl_version'])) {
+            $versionString = $versionString['ssl_version'];
+        } else {
+            return '';
+        }
+
+        $features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
+        if (!$this->config->getSystemValue('appstoreenabled', true)) {
+            $features = (string)$this->l10n->t('Federated Cloud Sharing');
+        }
+
+        // Check if at least OpenSSL after 1.01d or 1.0.2b
+        if (strpos($versionString, 'OpenSSL/') === 0) {
+            $majorVersion = substr($versionString, 8, 5);
+            $patchRelease = substr($versionString, 13, 6);
+
+            if (($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
+                ($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
+                return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['OpenSSL', $versionString, $features]);
+            }
+        }
+
+        // Check if NSS and perform heuristic check
+        if (strpos($versionString, 'NSS/') === 0) {
+            try {
+                $firstClient = $this->clientService->newClient();
+                $firstClient->get('https://nextcloud.com/');
+
+                $secondClient = $this->clientService->newClient();
+                $secondClient->get('https://nextcloud.com/');
+            } catch (ClientException $e) {
+                if ($e->getResponse()->getStatusCode() === 400) {
+                    return $this->l10n->t('cURL is using an outdated %1$s version (%2$s). Please update your operating system or features such as %3$s will not work reliably.', ['NSS', $versionString, $features]);
+                }
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Whether the version is outdated
+     *
+     * @return bool
+     */
+    protected function isPhpOutdated(): bool {
+        return PHP_VERSION_ID < 70300;
+    }
+
+    /**
+     * Whether the php version is still supported (at time of release)
+     * according to: https://secure.php.net/supported-versions.php
+     *
+     * @return array
+     */
+    private function isPhpSupported(): array {
+        return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
+    }
+
+    /**
+     * Check if the reverse proxy configuration is working as expected
+     *
+     * @return bool
+     */
+    private function forwardedForHeadersWorking() {
+        $trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
+        $remoteAddress = $this->request->getHeader('REMOTE_ADDR');
+
+        if (empty($trustedProxies) && $this->request->getHeader('X-Forwarded-Host') !== '') {
+            return false;
+        }
+
+        if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true)) {
+            return $remoteAddress !== $this->request->getRemoteAddress();
+        }
+
+        // either not enabled or working correctly
+        return true;
+    }
+
+    /**
+     * Checks if the correct memcache module for PHP is installed. Only
+     * fails if memcached is configured and the working module is not installed.
+     *
+     * @return bool
+     */
+    private function isCorrectMemcachedPHPModuleInstalled() {
+        if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+            return true;
+        }
+
+        // there are two different memcached modules for PHP
+        // we only support memcached and not memcache
+        // https://code.google.com/p/memcached/wiki/PHPClientComparison
+        return !(!extension_loaded('memcached') && extension_loaded('memcache'));
+    }
+
+    /**
+     * Checks if set_time_limit is not disabled.
+     *
+     * @return bool
+     */
+    private function isSettimelimitAvailable() {
+        if (function_exists('set_time_limit')
+            && strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return RedirectResponse
+     */
+    public function rescanFailedIntegrityCheck() {
+        $this->checker->runInstanceVerification();
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview'])
+        );
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @return DataResponse
+     */
+    public function getFailedIntegrityCheckFiles() {
+        if (!$this->checker->isCodeCheckEnforced()) {
+            return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+        }
+
+        $completeResults = $this->checker->getResults();
+
+        if (!empty($completeResults)) {
+            $formattedTextResponse = 'Technical information
 =====================
 The following list covers which files have failed the integrity check. Please read
 the previous linked documentation to learn more about the errors and how to fix
@@ -368,373 +368,373 @@  discard block
 block discarded – undo
 Results
 =======
 ';
-			foreach ($completeResults as $context => $contextResult) {
-				$formattedTextResponse .= "- $context\n";
-
-				foreach ($contextResult as $category => $result) {
-					$formattedTextResponse .= "\t- $category\n";
-					if ($category !== 'EXCEPTION') {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $key\n";
-						}
-					} else {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $results\n";
-						}
-					}
-				}
-			}
-
-			$formattedTextResponse .= '
+            foreach ($completeResults as $context => $contextResult) {
+                $formattedTextResponse .= "- $context\n";
+
+                foreach ($contextResult as $category => $result) {
+                    $formattedTextResponse .= "\t- $category\n";
+                    if ($category !== 'EXCEPTION') {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $key\n";
+                        }
+                    } else {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $results\n";
+                        }
+                    }
+                }
+            }
+
+            $formattedTextResponse .= '
 Raw output
 ==========
 ';
-			$formattedTextResponse .= print_r($completeResults, true);
-		} else {
-			$formattedTextResponse = 'No errors have been found.';
-		}
-
-
-		$response = new DataDisplayResponse(
-			$formattedTextResponse,
-			Http::STATUS_OK,
-			[
-				'Content-Type' => 'text/plain',
-			]
-		);
-
-		return $response;
-	}
-
-	/**
-	 * Checks whether a PHP opcache is properly set up
-	 * @return bool
-	 */
-	protected function isOpcacheProperlySetup() {
-		if (!$this->iniGetWrapper->getBool('opcache.enable')) {
-			return false;
-		}
-
-		if (!$this->iniGetWrapper->getBool('opcache.save_comments')) {
-			return false;
-		}
-
-		if ($this->iniGetWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
-			return false;
-		}
-
-		if ($this->iniGetWrapper->getNumeric('opcache.memory_consumption') < 128) {
-			return false;
-		}
-
-		if ($this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if the required FreeType functions are present
-	 * @return bool
-	 */
-	protected function hasFreeTypeSupport() {
-		return function_exists('imagettfbbox') && function_exists('imagettftext');
-	}
-
-	protected function hasMissingIndexes(): array {
-		$indexInfo = new MissingIndexInformation();
-		// Dispatch event so apps can also hint for pending index updates if needed
-		$event = new GenericEvent($indexInfo);
-		$this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
-
-		return $indexInfo->getListOfMissingIndexes();
-	}
-
-	protected function hasMissingColumns(): array {
-		$indexInfo = new MissingColumnInformation();
-		// Dispatch event so apps can also hint for pending index updates if needed
-		$event = new GenericEvent($indexInfo);
-		$this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_COLUMNS_EVENT, $event);
-
-		return $indexInfo->getListOfMissingColumns();
-	}
-
-	protected function isSqliteUsed() {
-		return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
-	}
-
-	protected function isReadOnlyConfig(): bool {
-		return \OC_Helper::isReadOnlyConfigEnabled();
-	}
-
-	protected function hasValidTransactionIsolationLevel(): bool {
-		try {
-			if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
-				return true;
-			}
-
-			return $this->db->getTransactionIsolation() === Connection::TRANSACTION_READ_COMMITTED;
-		} catch (DBALException $e) {
-			// ignore
-		}
-
-		return true;
-	}
-
-	protected function hasFileinfoInstalled(): bool {
-		return \OC_Util::fileInfoLoaded();
-	}
-
-	protected function hasWorkingFileLocking(): bool {
-		return !($this->lockingProvider instanceof NoopLockingProvider);
-	}
-
-	protected function getSuggestedOverwriteCliURL(): string {
-		$suggestedOverwriteCliUrl = '';
-		if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
-			$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
-			if (!$this->config->getSystemValue('config_is_read_only', false)) {
-				// Set the overwrite URL when it was not set yet.
-				$this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
-				$suggestedOverwriteCliUrl = '';
-			}
-		}
-		return $suggestedOverwriteCliUrl;
-	}
-
-	protected function getLastCronInfo(): array {
-		$lastCronRun = $this->config->getAppValue('core', 'lastcron', 0);
-		return [
-			'diffInSeconds' => time() - $lastCronRun,
-			'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun),
-			'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs',
-		];
-	}
-
-	protected function getCronErrors() {
-		$errors = json_decode($this->config->getAppValue('core', 'cronErrors', ''), true);
-
-		if (is_array($errors)) {
-			return $errors;
-		}
-
-		return [];
-	}
-
-	protected function isPHPMailerUsed(): bool {
-		return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
-	}
-
-	protected function hasOpcacheLoaded(): bool {
-		return extension_loaded('Zend OPcache');
-	}
-
-	/**
-	 * Iterates through the configured app roots and
-	 * tests if the subdirectories are owned by the same user than the current user.
-	 *
-	 * @return array
-	 */
-	protected function getAppDirsWithDifferentOwner(): array {
-		$currentUser = posix_getuid();
-		$appDirsWithDifferentOwner = [[]];
-
-		foreach (OC::$APPSROOTS as $appRoot) {
-			if ($appRoot['writable'] === true) {
-				$appDirsWithDifferentOwner[] = $this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot);
-			}
-		}
-
-		$appDirsWithDifferentOwner = array_merge(...$appDirsWithDifferentOwner);
-		sort($appDirsWithDifferentOwner);
-
-		return $appDirsWithDifferentOwner;
-	}
-
-	/**
-	 * Tests if the directories for one apps directory are writable by the current user.
-	 *
-	 * @param int $currentUser The current user
-	 * @param array $appRoot The app root config
-	 * @return string[] The none writable directory paths inside the app root
-	 */
-	private function getAppDirsWithDifferentOwnerForAppRoot(int $currentUser, array $appRoot): array {
-		$appDirsWithDifferentOwner = [];
-		$appsPath = $appRoot['path'];
-		$appsDir = new DirectoryIterator($appRoot['path']);
-
-		foreach ($appsDir as $fileInfo) {
-			if ($fileInfo->isDir() && !$fileInfo->isDot()) {
-				$absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
-				$appDirUser = fileowner($absAppPath);
-				if ($appDirUser !== $currentUser) {
-					$appDirsWithDifferentOwner[] = $absAppPath;
-				}
-			}
-		}
-
-		return $appDirsWithDifferentOwner;
-	}
-
-	/**
-	 * Checks for potential PHP modules that would improve the instance
-	 *
-	 * @return string[] A list of PHP modules that is recommended
-	 */
-	protected function hasRecommendedPHPModules(): array {
-		$recommendedPHPModules = [];
-
-		if (!extension_loaded('intl')) {
-			$recommendedPHPModules[] = 'intl';
-		}
-
-		if (!extension_loaded('bcmath')) {
-			$recommendedPHPModules[] = 'bcmath';
-		}
-
-		if (!extension_loaded('gmp')) {
-			$recommendedPHPModules[] = 'gmp';
-		}
-
-		if ($this->config->getAppValue('theming', 'enabled', 'no') === 'yes') {
-			if (!extension_loaded('imagick')) {
-				$recommendedPHPModules[] = 'imagick';
-			}
-		}
-
-		return $recommendedPHPModules;
-	}
-
-	protected function isMysqlUsedWithoutUTF8MB4(): bool {
-		return ($this->config->getSystemValue('dbtype', 'sqlite') === 'mysql') && ($this->config->getSystemValue('mysql.utf8mb4', false) === false);
-	}
-
-	protected function hasBigIntConversionPendingColumns(): array {
-		// copy of ConvertFilecacheBigInt::getColumnsByTable()
-		$tables = [
-			'activity' => ['activity_id', 'object_id'],
-			'activity_mq' => ['mail_id'],
-			'authtoken' => ['id'],
-			'bruteforce_attempts' => ['id'],
-			'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
-			'file_locks' => ['id'],
-			'jobs' => ['id'],
-			'mimetypes' => ['id'],
-			'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
-			'storages' => ['numeric_id'],
-		];
-
-		$schema = new SchemaWrapper($this->db);
-		$isSqlite = $this->db->getDatabasePlatform() instanceof SqlitePlatform;
-		$pendingColumns = [];
-
-		foreach ($tables as $tableName => $columns) {
-			if (!$schema->hasTable($tableName)) {
-				continue;
-			}
-
-			$table = $schema->getTable($tableName);
-			foreach ($columns as $columnName) {
-				$column = $table->getColumn($columnName);
-				$isAutoIncrement = $column->getAutoincrement();
-				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
-					$pendingColumns[] = $tableName . '.' . $columnName;
-				}
-			}
-		}
-
-		return $pendingColumns;
-	}
-
-	protected function isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(): bool {
-		$objectStore = $this->config->getSystemValue('objectstore', null);
-		$objectStoreMultibucket = $this->config->getSystemValue('objectstore_multibucket', null);
-
-		if (!isset($objectStoreMultibucket) && !isset($objectStore)) {
-			return true;
-		}
-
-		if (isset($objectStoreMultibucket['class']) && $objectStoreMultibucket['class'] !== 'OC\\Files\\ObjectStore\\S3') {
-			return true;
-		}
-
-		if (isset($objectStore['class']) && $objectStore['class'] !== 'OC\\Files\\ObjectStore\\S3') {
-			return true;
-		}
-
-		$tempPath = sys_get_temp_dir();
-		if (!is_dir($tempPath)) {
-			$this->logger->error('Error while checking the temporary PHP path - it was not properly set to a directory. value: ' . $tempPath);
-			return false;
-		}
-		$freeSpaceInTemp = disk_free_space($tempPath);
-		if ($freeSpaceInTemp === false) {
-			$this->logger->error('Error while checking the available disk space of temporary PHP path - no free disk space returned. temporary path: ' . $tempPath);
-			return false;
-		}
-
-		$freeSpaceInTempInGB = $freeSpaceInTemp / 1024 / 1024 / 1024;
-		if ($freeSpaceInTempInGB > 50) {
-			return true;
-		}
-
-		$this->logger->warning('Checking the available space in the temporary path resulted in ' . round($freeSpaceInTempInGB, 1) . ' GB instead of the recommended 50GB. Path: ' . $tempPath);
-		return false;
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function check() {
-		$phpDefaultCharset = new PhpDefaultCharset();
-		$phpOutputBuffering = new PhpOutputBuffering();
-		$legacySSEKeyFormat = new LegacySSEKeyFormat($this->l10n, $this->config, $this->urlGenerator);
-		return new DataResponse(
-			[
-				'isGetenvServerWorking' => !empty(getenv('PATH')),
-				'isReadOnlyConfig' => $this->isReadOnlyConfig(),
-				'hasValidTransactionIsolationLevel' => $this->hasValidTransactionIsolationLevel(),
-				'hasFileinfoInstalled' => $this->hasFileinfoInstalled(),
-				'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
-				'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
-				'cronInfo' => $this->getLastCronInfo(),
-				'cronErrors' => $this->getCronErrors(),
-				'serverHasInternetConnectionProblems' => $this->hasInternetConnectivityProblems(),
-				'isMemcacheConfigured' => $this->isMemcacheConfigured(),
-				'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
-				'isRandomnessSecure' => $this->isRandomnessSecure(),
-				'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
-				'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
-				'phpSupported' => $this->isPhpSupported(),
-				'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
-				'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
-				'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
-				'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
-				'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
-				'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
-				'hasOpcacheLoaded' => $this->hasOpcacheLoaded(),
-				'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
-				'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
-				'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
-				'missingIndexes' => $this->hasMissingIndexes(),
-				'missingColumns' => $this->hasMissingColumns(),
-				'isSqliteUsed' => $this->isSqliteUsed(),
-				'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
-				'isPHPMailerUsed' => $this->isPHPMailerUsed(),
-				'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'),
-				'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(),
-				'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(),
-				'recommendedPHPModules' => $this->hasRecommendedPHPModules(),
-				'pendingBigIntConversionColumns' => $this->hasBigIntConversionPendingColumns(),
-				'isMysqlUsedWithoutUTF8MB4' => $this->isMysqlUsedWithoutUTF8MB4(),
-				'isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed' => $this->isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(),
-				'reverseProxyGeneratedURL' => $this->urlGenerator->getAbsoluteURL('index.php'),
-				PhpDefaultCharset::class => ['pass' => $phpDefaultCharset->run(), 'description' => $phpDefaultCharset->description(), 'severity' => $phpDefaultCharset->severity()],
-				PhpOutputBuffering::class => ['pass' => $phpOutputBuffering->run(), 'description' => $phpOutputBuffering->description(), 'severity' => $phpOutputBuffering->severity()],
-				LegacySSEKeyFormat::class => ['pass' => $legacySSEKeyFormat->run(), 'description' => $legacySSEKeyFormat->description(), 'severity' => $legacySSEKeyFormat->severity(), 'linkToDocumentation' => $legacySSEKeyFormat->linkToDocumentation()],
-			]
-		);
-	}
+            $formattedTextResponse .= print_r($completeResults, true);
+        } else {
+            $formattedTextResponse = 'No errors have been found.';
+        }
+
+
+        $response = new DataDisplayResponse(
+            $formattedTextResponse,
+            Http::STATUS_OK,
+            [
+                'Content-Type' => 'text/plain',
+            ]
+        );
+
+        return $response;
+    }
+
+    /**
+     * Checks whether a PHP opcache is properly set up
+     * @return bool
+     */
+    protected function isOpcacheProperlySetup() {
+        if (!$this->iniGetWrapper->getBool('opcache.enable')) {
+            return false;
+        }
+
+        if (!$this->iniGetWrapper->getBool('opcache.save_comments')) {
+            return false;
+        }
+
+        if ($this->iniGetWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
+            return false;
+        }
+
+        if ($this->iniGetWrapper->getNumeric('opcache.memory_consumption') < 128) {
+            return false;
+        }
+
+        if ($this->iniGetWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if the required FreeType functions are present
+     * @return bool
+     */
+    protected function hasFreeTypeSupport() {
+        return function_exists('imagettfbbox') && function_exists('imagettftext');
+    }
+
+    protected function hasMissingIndexes(): array {
+        $indexInfo = new MissingIndexInformation();
+        // Dispatch event so apps can also hint for pending index updates if needed
+        $event = new GenericEvent($indexInfo);
+        $this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
+
+        return $indexInfo->getListOfMissingIndexes();
+    }
+
+    protected function hasMissingColumns(): array {
+        $indexInfo = new MissingColumnInformation();
+        // Dispatch event so apps can also hint for pending index updates if needed
+        $event = new GenericEvent($indexInfo);
+        $this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_COLUMNS_EVENT, $event);
+
+        return $indexInfo->getListOfMissingColumns();
+    }
+
+    protected function isSqliteUsed() {
+        return strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false;
+    }
+
+    protected function isReadOnlyConfig(): bool {
+        return \OC_Helper::isReadOnlyConfigEnabled();
+    }
+
+    protected function hasValidTransactionIsolationLevel(): bool {
+        try {
+            if ($this->db->getDatabasePlatform() instanceof SqlitePlatform) {
+                return true;
+            }
+
+            return $this->db->getTransactionIsolation() === Connection::TRANSACTION_READ_COMMITTED;
+        } catch (DBALException $e) {
+            // ignore
+        }
+
+        return true;
+    }
+
+    protected function hasFileinfoInstalled(): bool {
+        return \OC_Util::fileInfoLoaded();
+    }
+
+    protected function hasWorkingFileLocking(): bool {
+        return !($this->lockingProvider instanceof NoopLockingProvider);
+    }
+
+    protected function getSuggestedOverwriteCliURL(): string {
+        $suggestedOverwriteCliUrl = '';
+        if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
+            $suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
+            if (!$this->config->getSystemValue('config_is_read_only', false)) {
+                // Set the overwrite URL when it was not set yet.
+                $this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
+                $suggestedOverwriteCliUrl = '';
+            }
+        }
+        return $suggestedOverwriteCliUrl;
+    }
+
+    protected function getLastCronInfo(): array {
+        $lastCronRun = $this->config->getAppValue('core', 'lastcron', 0);
+        return [
+            'diffInSeconds' => time() - $lastCronRun,
+            'relativeTime' => $this->dateTimeFormatter->formatTimeSpan($lastCronRun),
+            'backgroundJobsUrl' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'server']) . '#backgroundjobs',
+        ];
+    }
+
+    protected function getCronErrors() {
+        $errors = json_decode($this->config->getAppValue('core', 'cronErrors', ''), true);
+
+        if (is_array($errors)) {
+            return $errors;
+        }
+
+        return [];
+    }
+
+    protected function isPHPMailerUsed(): bool {
+        return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
+    }
+
+    protected function hasOpcacheLoaded(): bool {
+        return extension_loaded('Zend OPcache');
+    }
+
+    /**
+     * Iterates through the configured app roots and
+     * tests if the subdirectories are owned by the same user than the current user.
+     *
+     * @return array
+     */
+    protected function getAppDirsWithDifferentOwner(): array {
+        $currentUser = posix_getuid();
+        $appDirsWithDifferentOwner = [[]];
+
+        foreach (OC::$APPSROOTS as $appRoot) {
+            if ($appRoot['writable'] === true) {
+                $appDirsWithDifferentOwner[] = $this->getAppDirsWithDifferentOwnerForAppRoot($currentUser, $appRoot);
+            }
+        }
+
+        $appDirsWithDifferentOwner = array_merge(...$appDirsWithDifferentOwner);
+        sort($appDirsWithDifferentOwner);
+
+        return $appDirsWithDifferentOwner;
+    }
+
+    /**
+     * Tests if the directories for one apps directory are writable by the current user.
+     *
+     * @param int $currentUser The current user
+     * @param array $appRoot The app root config
+     * @return string[] The none writable directory paths inside the app root
+     */
+    private function getAppDirsWithDifferentOwnerForAppRoot(int $currentUser, array $appRoot): array {
+        $appDirsWithDifferentOwner = [];
+        $appsPath = $appRoot['path'];
+        $appsDir = new DirectoryIterator($appRoot['path']);
+
+        foreach ($appsDir as $fileInfo) {
+            if ($fileInfo->isDir() && !$fileInfo->isDot()) {
+                $absAppPath = $appsPath . DIRECTORY_SEPARATOR . $fileInfo->getFilename();
+                $appDirUser = fileowner($absAppPath);
+                if ($appDirUser !== $currentUser) {
+                    $appDirsWithDifferentOwner[] = $absAppPath;
+                }
+            }
+        }
+
+        return $appDirsWithDifferentOwner;
+    }
+
+    /**
+     * Checks for potential PHP modules that would improve the instance
+     *
+     * @return string[] A list of PHP modules that is recommended
+     */
+    protected function hasRecommendedPHPModules(): array {
+        $recommendedPHPModules = [];
+
+        if (!extension_loaded('intl')) {
+            $recommendedPHPModules[] = 'intl';
+        }
+
+        if (!extension_loaded('bcmath')) {
+            $recommendedPHPModules[] = 'bcmath';
+        }
+
+        if (!extension_loaded('gmp')) {
+            $recommendedPHPModules[] = 'gmp';
+        }
+
+        if ($this->config->getAppValue('theming', 'enabled', 'no') === 'yes') {
+            if (!extension_loaded('imagick')) {
+                $recommendedPHPModules[] = 'imagick';
+            }
+        }
+
+        return $recommendedPHPModules;
+    }
+
+    protected function isMysqlUsedWithoutUTF8MB4(): bool {
+        return ($this->config->getSystemValue('dbtype', 'sqlite') === 'mysql') && ($this->config->getSystemValue('mysql.utf8mb4', false) === false);
+    }
+
+    protected function hasBigIntConversionPendingColumns(): array {
+        // copy of ConvertFilecacheBigInt::getColumnsByTable()
+        $tables = [
+            'activity' => ['activity_id', 'object_id'],
+            'activity_mq' => ['mail_id'],
+            'authtoken' => ['id'],
+            'bruteforce_attempts' => ['id'],
+            'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
+            'file_locks' => ['id'],
+            'jobs' => ['id'],
+            'mimetypes' => ['id'],
+            'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
+            'storages' => ['numeric_id'],
+        ];
+
+        $schema = new SchemaWrapper($this->db);
+        $isSqlite = $this->db->getDatabasePlatform() instanceof SqlitePlatform;
+        $pendingColumns = [];
+
+        foreach ($tables as $tableName => $columns) {
+            if (!$schema->hasTable($tableName)) {
+                continue;
+            }
+
+            $table = $schema->getTable($tableName);
+            foreach ($columns as $columnName) {
+                $column = $table->getColumn($columnName);
+                $isAutoIncrement = $column->getAutoincrement();
+                $isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
+                if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
+                    $pendingColumns[] = $tableName . '.' . $columnName;
+                }
+            }
+        }
+
+        return $pendingColumns;
+    }
+
+    protected function isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(): bool {
+        $objectStore = $this->config->getSystemValue('objectstore', null);
+        $objectStoreMultibucket = $this->config->getSystemValue('objectstore_multibucket', null);
+
+        if (!isset($objectStoreMultibucket) && !isset($objectStore)) {
+            return true;
+        }
+
+        if (isset($objectStoreMultibucket['class']) && $objectStoreMultibucket['class'] !== 'OC\\Files\\ObjectStore\\S3') {
+            return true;
+        }
+
+        if (isset($objectStore['class']) && $objectStore['class'] !== 'OC\\Files\\ObjectStore\\S3') {
+            return true;
+        }
+
+        $tempPath = sys_get_temp_dir();
+        if (!is_dir($tempPath)) {
+            $this->logger->error('Error while checking the temporary PHP path - it was not properly set to a directory. value: ' . $tempPath);
+            return false;
+        }
+        $freeSpaceInTemp = disk_free_space($tempPath);
+        if ($freeSpaceInTemp === false) {
+            $this->logger->error('Error while checking the available disk space of temporary PHP path - no free disk space returned. temporary path: ' . $tempPath);
+            return false;
+        }
+
+        $freeSpaceInTempInGB = $freeSpaceInTemp / 1024 / 1024 / 1024;
+        if ($freeSpaceInTempInGB > 50) {
+            return true;
+        }
+
+        $this->logger->warning('Checking the available space in the temporary path resulted in ' . round($freeSpaceInTempInGB, 1) . ' GB instead of the recommended 50GB. Path: ' . $tempPath);
+        return false;
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function check() {
+        $phpDefaultCharset = new PhpDefaultCharset();
+        $phpOutputBuffering = new PhpOutputBuffering();
+        $legacySSEKeyFormat = new LegacySSEKeyFormat($this->l10n, $this->config, $this->urlGenerator);
+        return new DataResponse(
+            [
+                'isGetenvServerWorking' => !empty(getenv('PATH')),
+                'isReadOnlyConfig' => $this->isReadOnlyConfig(),
+                'hasValidTransactionIsolationLevel' => $this->hasValidTransactionIsolationLevel(),
+                'hasFileinfoInstalled' => $this->hasFileinfoInstalled(),
+                'hasWorkingFileLocking' => $this->hasWorkingFileLocking(),
+                'suggestedOverwriteCliURL' => $this->getSuggestedOverwriteCliURL(),
+                'cronInfo' => $this->getLastCronInfo(),
+                'cronErrors' => $this->getCronErrors(),
+                'serverHasInternetConnectionProblems' => $this->hasInternetConnectivityProblems(),
+                'isMemcacheConfigured' => $this->isMemcacheConfigured(),
+                'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
+                'isRandomnessSecure' => $this->isRandomnessSecure(),
+                'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
+                'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
+                'phpSupported' => $this->isPhpSupported(),
+                'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
+                'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+                'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
+                'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
+                'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
+                'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
+                'hasOpcacheLoaded' => $this->hasOpcacheLoaded(),
+                'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
+                'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
+                'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
+                'missingIndexes' => $this->hasMissingIndexes(),
+                'missingColumns' => $this->hasMissingColumns(),
+                'isSqliteUsed' => $this->isSqliteUsed(),
+                'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'),
+                'isPHPMailerUsed' => $this->isPHPMailerUsed(),
+                'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin'),
+                'isMemoryLimitSufficient' => $this->memoryInfo->isMemoryLimitSufficient(),
+                'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(),
+                'recommendedPHPModules' => $this->hasRecommendedPHPModules(),
+                'pendingBigIntConversionColumns' => $this->hasBigIntConversionPendingColumns(),
+                'isMysqlUsedWithoutUTF8MB4' => $this->isMysqlUsedWithoutUTF8MB4(),
+                'isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed' => $this->isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(),
+                'reverseProxyGeneratedURL' => $this->urlGenerator->getAbsoluteURL('index.php'),
+                PhpDefaultCharset::class => ['pass' => $phpDefaultCharset->run(), 'description' => $phpDefaultCharset->description(), 'severity' => $phpDefaultCharset->severity()],
+                PhpOutputBuffering::class => ['pass' => $phpOutputBuffering->run(), 'description' => $phpOutputBuffering->description(), 'severity' => $phpOutputBuffering->severity()],
+                LegacySSEKeyFormat::class => ['pass' => $legacySSEKeyFormat->run(), 'description' => $legacySSEKeyFormat->description(), 'severity' => $legacySSEKeyFormat->severity(), 'linkToDocumentation' => $legacySSEKeyFormat->linkToDocumentation()],
+            ]
+        );
+    }
 }

Please login to merge, or discard this patch.

		@@ -49,143 +49,143 @@
		block discarded – undo
49	49	$application->add(new OC\Core\Command\App\CheckCode());
50	50	$application->add(new OC\Core\Command\L10n\CreateJs());
51	51	$application->add(new \OC\Core\Command\Integrity\SignApp(
52		- \OC::$server->getIntegrityCodeChecker(),
53		- new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
54		- \OC::$server->getURLGenerator()
	52	+ \OC::$server->getIntegrityCodeChecker(),
	53	+ new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
	54	+ \OC::$server->getURLGenerator()
55	55	));
56	56	$application->add(new \OC\Core\Command\Integrity\SignCore(
57		- \OC::$server->getIntegrityCodeChecker(),
58		- new \OC\IntegrityCheck\Helpers\FileAccessHelper()
	57	+ \OC::$server->getIntegrityCodeChecker(),
	58	+ new \OC\IntegrityCheck\Helpers\FileAccessHelper()
59	59	));
60	60	$application->add(new \OC\Core\Command\Integrity\CheckApp(
61		- \OC::$server->getIntegrityCodeChecker()
	61	+ \OC::$server->getIntegrityCodeChecker()
62	62	));
63	63	$application->add(new \OC\Core\Command\Integrity\CheckCore(
64		- \OC::$server->getIntegrityCodeChecker()
	64	+ \OC::$server->getIntegrityCodeChecker()
65	65	));
66	66
67	67
68	68	if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
69		- $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
70		- $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager(), \OC::$server->getGroupManager()));
71		- $application->add(new OC\Core\Command\App\Install());
72		- $application->add(new OC\Core\Command\App\GetPath());
73		- $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
74		- $application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->query(\OC\Installer::class), \OC::$server->getLogger()));
75		- $application->add(\OC::$server->query(\OC\Core\Command\App\Update::class));
76		-
77		- $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Cleanup::class));
78		- $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enforce::class));
79		- $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enable::class));
80		- $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Disable::class));
81		- $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\State::class));
82		-
83		- $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
84		- $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
85		- $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
86		-
87		- $application->add(\OC::$server->query(\OC\Core\Command\Broadcast\Test::class));
88		-
89		- $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
90		- $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
91		- $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
92		- $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
93		- $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
94		- $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
95		- $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
96		- $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
97		-
98		- $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
99		- $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
100		- $application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->getDatabaseConnection()));
101		- $application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
102		- $application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
103		- $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
104		- $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
105		- $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager()));
106		- $application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
107		- $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager(), \OC::$server->getConfig()));
108		-
109		- $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
110		- $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
111		- $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
112		- $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
113		- $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
114		- $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
115		- $application->add(new OC\Core\Command\Encryption\DecryptAll(
116		- \OC::$server->getEncryptionManager(),
117		- \OC::$server->getAppManager(),
118		- \OC::$server->getConfig(),
119		- new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
120		- new \Symfony\Component\Console\Helper\QuestionHelper())
121		- );
122		-
123		- $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
124		- $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
125		-
126		- $view = new \OC\Files\View();
127		- $util = new \OC\Encryption\Util(
128		- $view,
129		- \OC::$server->getUserManager(),
130		- \OC::$server->getGroupManager(),
131		- \OC::$server->getConfig()
132		- );
133		- $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
134		- $view,
135		- \OC::$server->getUserManager(),
136		- \OC::$server->getConfig(),
137		- $util,
138		- new \Symfony\Component\Console\Helper\QuestionHelper()
139		- )
140		- );
141		- $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
142		- $application->add(new OC\Core\Command\Encryption\MigrateKeyStorage(
143		- $view,
144		- \OC::$server->getUserManager(),
145		- \OC::$server->getConfig(),
146		- $util,
147		- \OC::$server->getCrypto()
148		- )
149		- );
150		-
151		- $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
152		- $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
153		- $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
154		- $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
155		- $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
156		- $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
157		-
158		- $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
159		- $application->add(new OC\Core\Command\Maintenance\Repair(
160		- new \OC\Repair([], \OC::$server->getEventDispatcher()),
161		- \OC::$server->getConfig(),
162		- \OC::$server->getEventDispatcher(),
163		- \OC::$server->getAppManager()
164		- ));
165		-
166		- $application->add(\OC::$server->query(\OC\Core\Command\Preview\Repair::class));
167		-
168		- $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
169		- $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
170		- $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
171		- $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
172		- $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
173		- $application->add(\OC::$server->get(\OC\Core\Command\User\Report::class));
174		- $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
175		- $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
176		- $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
177		- $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
178		-
179		- $application->add(new OC\Core\Command\Group\Add(\OC::$server->getGroupManager()));
180		- $application->add(new OC\Core\Command\Group\Delete(\OC::$server->getGroupManager()));
181		- $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
182		- $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
183		- $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
184		-
185		- $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
186		- $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
187		- $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
188		- $application->add(new OC\Core\Command\Security\ResetBruteforceAttempts(\OC::$server->getBruteForceThrottler()));
	69	+ $application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
	70	+ $application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager(), \OC::$server->getGroupManager()));
	71	+ $application->add(new OC\Core\Command\App\Install());
	72	+ $application->add(new OC\Core\Command\App\GetPath());
	73	+ $application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
	74	+ $application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->query(\OC\Installer::class), \OC::$server->getLogger()));
	75	+ $application->add(\OC::$server->query(\OC\Core\Command\App\Update::class));
	76	+
	77	+ $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Cleanup::class));
	78	+ $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enforce::class));
	79	+ $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enable::class));
	80	+ $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Disable::class));
	81	+ $application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\State::class));
	82	+
	83	+ $application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
	84	+ $application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
	85	+ $application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
	86	+
	87	+ $application->add(\OC::$server->query(\OC\Core\Command\Broadcast\Test::class));
	88	+
	89	+ $application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
	90	+ $application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
	91	+ $application->add(new OC\Core\Command\Config\App\SetConfig(\OC::$server->getConfig()));
	92	+ $application->add(new OC\Core\Command\Config\Import(\OC::$server->getConfig()));
	93	+ $application->add(new OC\Core\Command\Config\ListConfigs(\OC::$server->getSystemConfig(), \OC::$server->getAppConfig()));
	94	+ $application->add(new OC\Core\Command\Config\System\DeleteConfig(\OC::$server->getSystemConfig()));
	95	+ $application->add(new OC\Core\Command\Config\System\GetConfig(\OC::$server->getSystemConfig()));
	96	+ $application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
	97	+
	98	+ $application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
	99	+ $application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
	100	+ $application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->getDatabaseConnection()));
	101	+ $application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
	102	+ $application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()));
	103	+ $application->add(new OC\Core\Command\Db\Migrations\StatusCommand(\OC::$server->getDatabaseConnection()));
	104	+ $application->add(new OC\Core\Command\Db\Migrations\MigrateCommand(\OC::$server->getDatabaseConnection()));
	105	+ $application->add(new OC\Core\Command\Db\Migrations\GenerateCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager()));
	106	+ $application->add(new OC\Core\Command\Db\Migrations\GenerateFromSchemaFileCommand(\OC::$server->getConfig(), \OC::$server->getAppManager(), \OC::$server->getDatabaseConnection()));
	107	+ $application->add(new OC\Core\Command\Db\Migrations\ExecuteCommand(\OC::$server->getDatabaseConnection(), \OC::$server->getAppManager(), \OC::$server->getConfig()));
	108	+
	109	+ $application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
	110	+ $application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
	111	+ $application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
	112	+ $application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
	113	+ $application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
	114	+ $application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
	115	+ $application->add(new OC\Core\Command\Encryption\DecryptAll(
	116	+ \OC::$server->getEncryptionManager(),
	117	+ \OC::$server->getAppManager(),
	118	+ \OC::$server->getConfig(),
	119	+ new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
	120	+ new \Symfony\Component\Console\Helper\QuestionHelper())
	121	+ );
	122	+
	123	+ $application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
	124	+ $application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
	125	+
	126	+ $view = new \OC\Files\View();
	127	+ $util = new \OC\Encryption\Util(
	128	+ $view,
	129	+ \OC::$server->getUserManager(),
	130	+ \OC::$server->getGroupManager(),
	131	+ \OC::$server->getConfig()
	132	+ );
	133	+ $application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
	134	+ $view,
	135	+ \OC::$server->getUserManager(),
	136	+ \OC::$server->getConfig(),
	137	+ $util,
	138	+ new \Symfony\Component\Console\Helper\QuestionHelper()
	139	+ )
	140	+ );
	141	+ $application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
	142	+ $application->add(new OC\Core\Command\Encryption\MigrateKeyStorage(
	143	+ $view,
	144	+ \OC::$server->getUserManager(),
	145	+ \OC::$server->getConfig(),
	146	+ $util,
	147	+ \OC::$server->getCrypto()
	148	+ )
	149	+ );
	150	+
	151	+ $application->add(new OC\Core\Command\Maintenance\DataFingerprint(\OC::$server->getConfig(), new \OC\AppFramework\Utility\TimeFactory()));
	152	+ $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
	153	+ $application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
	154	+ $application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
	155	+ $application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
	156	+ $application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
	157	+
	158	+ $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
	159	+ $application->add(new OC\Core\Command\Maintenance\Repair(
	160	+ new \OC\Repair([], \OC::$server->getEventDispatcher()),
	161	+ \OC::$server->getConfig(),
	162	+ \OC::$server->getEventDispatcher(),
	163	+ \OC::$server->getAppManager()
	164	+ ));
	165	+
	166	+ $application->add(\OC::$server->query(\OC\Core\Command\Preview\Repair::class));
	167	+
	168	+ $application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	169	+ $application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
	170	+ $application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
	171	+ $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
	172	+ $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
	173	+ $application->add(\OC::$server->get(\OC\Core\Command\User\Report::class));
	174	+ $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
	175	+ $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
	176	+ $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	177	+ $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	178	+
	179	+ $application->add(new OC\Core\Command\Group\Add(\OC::$server->getGroupManager()));
	180	+ $application->add(new OC\Core\Command\Group\Delete(\OC::$server->getGroupManager()));
	181	+ $application->add(new OC\Core\Command\Group\ListCommand(\OC::$server->getGroupManager()));
	182	+ $application->add(new OC\Core\Command\Group\AddUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	183	+ $application->add(new OC\Core\Command\Group\RemoveUser(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
	184	+
	185	+ $application->add(new OC\Core\Command\Security\ListCertificates(\OC::$server->getCertificateManager(null), \OC::$server->getL10N('core')));
	186	+ $application->add(new OC\Core\Command\Security\ImportCertificate(\OC::$server->getCertificateManager(null)));
	187	+ $application->add(new OC\Core\Command\Security\RemoveCertificate(\OC::$server->getCertificateManager(null)));
	188	+ $application->add(new OC\Core\Command\Security\ResetBruteforceAttempts(\OC::$server->getBruteForceThrottler()));
189	189	} else {
190		- $application->add(\OC::$server->get(\OC\Core\Command\Maintenance\Install::class));
	190	+ $application->add(\OC::$server->get(\OC\Core\Command\Maintenance\Install::class));
191	191	}

		@@ -47,166 +47,166 @@
		block discarded – undo
47	47
48	48	class Install extends Command {
49	49
50		- /** @var SystemConfig */
51		- private $config;
52		- /** @var IniGetWrapper */
53		- private $iniGetWrapper;
54		-
55		- public function __construct(SystemConfig $config, IniGetWrapper $iniGetWrapper) {
56		- parent::__construct();
57		- $this->config = $config;
58		- $this->iniGetWrapper = $iniGetWrapper;
59		- }
60		-
61		- protected function configure() {
62		- $this
63		- ->setName('maintenance:install')
64		- ->setDescription('install Nextcloud')
65		- ->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
66		- ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
67		- ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
68		- ->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
69		- ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
70		- ->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
71		- ->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
72		- ->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
73		- ->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
74		- ->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
75		- ->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
76		- }
77		-
78		- protected function execute(InputInterface $input, OutputInterface $output): int {
79		-
80		- // validate the environment
81		- $server = \OC::$server;
82		- $setupHelper = new Setup(
83		- $this->config,
84		- $this->iniGetWrapper,
85		- $server->getL10N('lib'),
86		- $server->query(Defaults::class),
87		- $server->getLogger(),
88		- $server->getSecureRandom(),
89		- \OC::$server->query(Installer::class)
90		- );
91		- $sysInfo = $setupHelper->getSystemInfo(true);
92		- $errors = $sysInfo['errors'];
93		- if (count($errors) > 0) {
94		- $this->printErrors($output, $errors);
95		-
96		- // ignore the OS X setup warning
97		- if (count($errors) !== 1 \|\|
98		- (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
99		- return 1;
100		- }
101		- }
102		-
103		- // validate user input
104		- $options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
105		-
106		- // perform installation
107		- $errors = $setupHelper->install($options);
108		- if (count($errors) > 0) {
109		- $this->printErrors($output, $errors);
110		- return 1;
111		- }
112		- $output->writeln("Nextcloud was successfully installed");
113		- return 0;
114		- }
115		-
116		- /**
117		- * @param InputInterface $input
118		- * @param OutputInterface $output
119		- * @param string[] $supportedDatabases
120		- * @return array
121		- */
122		- protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
123		- $db = strtolower($input->getOption('database'));
124		-
125		- if (!in_array($db, $supportedDatabases)) {
126		- throw new InvalidArgumentException("Database <$db> is not supported.");
127		- }
128		-
129		- $dbUser = $input->getOption('database-user');
130		- $dbPass = $input->getOption('database-pass');
131		- $dbName = $input->getOption('database-name');
132		- $dbPort = $input->getOption('database-port');
133		- if ($db === 'oci') {
134		- // an empty hostname needs to be read from the raw parameters
135		- $dbHost = $input->getParameterOption('--database-host', '');
136		- } else {
137		- $dbHost = $input->getOption('database-host');
138		- }
139		- if ($dbPort) {
140		- // Append the port to the host so it is the same as in the config (there is no dbport config)
141		- $dbHost .= ':' . $dbPort;
142		- }
143		- if ($input->hasParameterOption('--database-pass')) {
144		- $dbPass = (string) $input->getOption('database-pass');
145		- }
146		- $adminLogin = $input->getOption('admin-user');
147		- $adminPassword = $input->getOption('admin-pass');
148		- $adminEmail = $input->getOption('admin-email');
149		- $dataDir = $input->getOption('data-dir');
150		-
151		- if ($db !== 'sqlite') {
152		- if (is_null($dbUser)) {
153		- throw new InvalidArgumentException("Database user not provided.");
154		- }
155		- if (is_null($dbName)) {
156		- throw new InvalidArgumentException("Database name not provided.");
157		- }
158		- if (is_null($dbPass)) {
159		- /** @var QuestionHelper $helper */
160		- $helper = $this->getHelper('question');
161		- $question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
162		- $question->setHidden(true);
163		- $question->setHiddenFallback(false);
164		- $dbPass = $helper->ask($input, $output, $question);
165		- }
166		- }
167		-
168		- if (is_null($adminPassword)) {
169		- /** @var QuestionHelper $helper */
170		- $helper = $this->getHelper('question');
171		- $question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
172		- $question->setHidden(true);
173		- $question->setHiddenFallback(false);
174		- $adminPassword = $helper->ask($input, $output, $question);
175		- }
176		-
177		- if ($adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) {
178		- throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.');
179		- }
180		-
181		- $options = [
182		- 'dbtype' => $db,
183		- 'dbuser' => $dbUser,
184		- 'dbpass' => $dbPass,
185		- 'dbname' => $dbName,
186		- 'dbhost' => $dbHost,
187		- 'adminlogin' => $adminLogin,
188		- 'adminpass' => $adminPassword,
189		- 'adminemail' => $adminEmail,
190		- 'directory' => $dataDir
191		- ];
192		- if ($db === 'oci') {
193		- $options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
194		- }
195		- return $options;
196		- }
197		-
198		- /**
199		- * @param OutputInterface $output
200		- * @param $errors
201		- */
202		- protected function printErrors(OutputInterface $output, $errors) {
203		- foreach ($errors as $error) {
204		- if (is_array($error)) {
205		- $output->writeln('<error>' . (string)$error['error'] . '</error>');
206		- $output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
207		- } else {
208		- $output->writeln('<error>' . (string)$error . '</error>');
209		- }
210		- }
211		- }
	50	+ /** @var SystemConfig */
	51	+ private $config;
	52	+ /** @var IniGetWrapper */
	53	+ private $iniGetWrapper;
	54	+
	55	+ public function __construct(SystemConfig $config, IniGetWrapper $iniGetWrapper) {
	56	+ parent::__construct();
	57	+ $this->config = $config;
	58	+ $this->iniGetWrapper = $iniGetWrapper;
	59	+ }
	60	+
	61	+ protected function configure() {
	62	+ $this
	63	+ ->setName('maintenance:install')
	64	+ ->setDescription('install Nextcloud')
	65	+ ->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
	66	+ ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
	67	+ ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
	68	+ ->addOption('database-port', null, InputOption::VALUE_REQUIRED, 'Port the database is listening on')
	69	+ ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database')
	70	+ ->addOption('database-pass', null, InputOption::VALUE_OPTIONAL, 'Password of the database user', null)
	71	+ ->addOption('database-table-space', null, InputOption::VALUE_OPTIONAL, 'Table space of the database (oci only)', null)
	72	+ ->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin')
	73	+ ->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account')
	74	+ ->addOption('admin-email', null, InputOption::VALUE_OPTIONAL, 'E-Mail of the admin account')
	75	+ ->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
	76	+ }
	77	+
	78	+ protected function execute(InputInterface $input, OutputInterface $output): int {
	79	+
	80	+ // validate the environment
	81	+ $server = \OC::$server;
	82	+ $setupHelper = new Setup(
	83	+ $this->config,
	84	+ $this->iniGetWrapper,
	85	+ $server->getL10N('lib'),
	86	+ $server->query(Defaults::class),
	87	+ $server->getLogger(),
	88	+ $server->getSecureRandom(),
	89	+ \OC::$server->query(Installer::class)
	90	+ );
	91	+ $sysInfo = $setupHelper->getSystemInfo(true);
	92	+ $errors = $sysInfo['errors'];
	93	+ if (count($errors) > 0) {
	94	+ $this->printErrors($output, $errors);
	95	+
	96	+ // ignore the OS X setup warning
	97	+ if (count($errors) !== 1 \|\|
	98	+ (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk! ') {
	99	+ return 1;
	100	+ }
	101	+ }
	102	+
	103	+ // validate user input
	104	+ $options = $this->validateInput($input, $output, array_keys($sysInfo['databases']));
	105	+
	106	+ // perform installation
	107	+ $errors = $setupHelper->install($options);
	108	+ if (count($errors) > 0) {
	109	+ $this->printErrors($output, $errors);
	110	+ return 1;
	111	+ }
	112	+ $output->writeln("Nextcloud was successfully installed");
	113	+ return 0;
	114	+ }
	115	+
	116	+ /**
	117	+ * @param InputInterface $input
	118	+ * @param OutputInterface $output
	119	+ * @param string[] $supportedDatabases
	120	+ * @return array
	121	+ */
	122	+ protected function validateInput(InputInterface $input, OutputInterface $output, $supportedDatabases) {
	123	+ $db = strtolower($input->getOption('database'));
	124	+
	125	+ if (!in_array($db, $supportedDatabases)) {
	126	+ throw new InvalidArgumentException("Database <$db> is not supported.");
	127	+ }
	128	+
	129	+ $dbUser = $input->getOption('database-user');
	130	+ $dbPass = $input->getOption('database-pass');
	131	+ $dbName = $input->getOption('database-name');
	132	+ $dbPort = $input->getOption('database-port');
	133	+ if ($db === 'oci') {
	134	+ // an empty hostname needs to be read from the raw parameters
	135	+ $dbHost = $input->getParameterOption('--database-host', '');
	136	+ } else {
	137	+ $dbHost = $input->getOption('database-host');
	138	+ }
	139	+ if ($dbPort) {
	140	+ // Append the port to the host so it is the same as in the config (there is no dbport config)
	141	+ $dbHost .= ':' . $dbPort;
	142	+ }
	143	+ if ($input->hasParameterOption('--database-pass')) {
	144	+ $dbPass = (string) $input->getOption('database-pass');
	145	+ }
	146	+ $adminLogin = $input->getOption('admin-user');
	147	+ $adminPassword = $input->getOption('admin-pass');
	148	+ $adminEmail = $input->getOption('admin-email');
	149	+ $dataDir = $input->getOption('data-dir');
	150	+
	151	+ if ($db !== 'sqlite') {
	152	+ if (is_null($dbUser)) {
	153	+ throw new InvalidArgumentException("Database user not provided.");
	154	+ }
	155	+ if (is_null($dbName)) {
	156	+ throw new InvalidArgumentException("Database name not provided.");
	157	+ }
	158	+ if (is_null($dbPass)) {
	159	+ /** @var QuestionHelper $helper */
	160	+ $helper = $this->getHelper('question');
	161	+ $question = new Question('What is the password to access the database with user <'.$dbUser.'>?');
	162	+ $question->setHidden(true);
	163	+ $question->setHiddenFallback(false);
	164	+ $dbPass = $helper->ask($input, $output, $question);
	165	+ }
	166	+ }
	167	+
	168	+ if (is_null($adminPassword)) {
	169	+ /** @var QuestionHelper $helper */
	170	+ $helper = $this->getHelper('question');
	171	+ $question = new Question('What is the password you like to use for the admin account <'.$adminLogin.'>?');
	172	+ $question->setHidden(true);
	173	+ $question->setHiddenFallback(false);
	174	+ $adminPassword = $helper->ask($input, $output, $question);
	175	+ }
	176	+
	177	+ if ($adminEmail !== null && !filter_var($adminEmail, FILTER_VALIDATE_EMAIL)) {
	178	+ throw new InvalidArgumentException('Invalid e-mail-address <' . $adminEmail . '> for <' . $adminLogin . '>.');
	179	+ }
	180	+
	181	+ $options = [
	182	+ 'dbtype' => $db,
	183	+ 'dbuser' => $dbUser,
	184	+ 'dbpass' => $dbPass,
	185	+ 'dbname' => $dbName,
	186	+ 'dbhost' => $dbHost,
	187	+ 'adminlogin' => $adminLogin,
	188	+ 'adminpass' => $adminPassword,
	189	+ 'adminemail' => $adminEmail,
	190	+ 'directory' => $dataDir
	191	+ ];
	192	+ if ($db === 'oci') {
	193	+ $options['dbtablespace'] = $input->getParameterOption('--database-table-space', '');
	194	+ }
	195	+ return $options;
	196	+ }
	197	+
	198	+ /**
	199	+ * @param OutputInterface $output
	200	+ * @param $errors
	201	+ */
	202	+ protected function printErrors(OutputInterface $output, $errors) {
	203	+ foreach ($errors as $error) {
	204	+ if (is_array($error)) {
	205	+ $output->writeln('<error>' . (string)$error['error'] . '</error>');
	206	+ $output->writeln('<info> -> ' . (string)$error['hint'] . '</info>');
	207	+ } else {
	208	+ $output->writeln('<error>' . (string)$error . '</error>');
	209	+ }
	210	+ }
	211	+ }
212	212	}

nextcloud / server

Push — master ( ed1f89...987f62 )

Status

Category

Indentation +128 added lines, -128 removed lines patch added patch discarded remove patch

Indentation +162 added lines, -162 removed lines patch added patch discarded remove patch

Indentation +652 added lines, -652 removed lines patch added patch discarded remove patch