From bffa61fc320f1652c262b3715279f62b328224ea Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 7 Jan 2021 16:26:51 +0100 Subject: Add setup check to verify that the used DB version is still supported in the next major release Signed-off-by: Morris Jobke --- apps/settings/lib/Controller/CheckSetupController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'apps/settings/lib/Controller/CheckSetupController.php') diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 5b004d753e2..36148398c36 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -62,6 +62,7 @@ use OCA\Settings\SetupChecks\CheckUserCertificates; use OCA\Settings\SetupChecks\LegacySSEKeyFormat; use OCA\Settings\SetupChecks\PhpDefaultCharset; use OCA\Settings\SetupChecks\PhpOutputBuffering; +use OCA\Settings\SetupChecks\SupportedDatabase; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataDisplayResponse; use OCP\AppFramework\Http\DataResponse; @@ -106,6 +107,8 @@ class CheckSetupController extends Controller { private $secureRandom; /** @var IniGetWrapper */ private $iniGetWrapper; + /** @var IDBConnection */ + private $connection; public function __construct($AppName, IRequest $request, @@ -121,7 +124,8 @@ class CheckSetupController extends Controller { IDateTimeFormatter $dateTimeFormatter, MemoryInfo $memoryInfo, ISecureRandom $secureRandom, - IniGetWrapper $iniGetWrapper) { + IniGetWrapper $iniGetWrapper, + IDBConnection $connection) { parent::__construct($AppName, $request); $this->config = $config; $this->clientService = $clientService; @@ -136,6 +140,7 @@ class CheckSetupController extends Controller { $this->memoryInfo = $memoryInfo; $this->secureRandom = $secureRandom; $this->iniGetWrapper = $iniGetWrapper; + $this->connection = $connection; } /** @@ -713,6 +718,7 @@ Raw output $phpOutputBuffering = new PhpOutputBuffering(); $legacySSEKeyFormat = new LegacySSEKeyFormat($this->l10n, $this->config, $this->urlGenerator); $checkUserCertificates = new CheckUserCertificates($this->l10n, $this->config, $this->urlGenerator); + $supportedDatabases = new SupportedDatabase($this->l10n, $this->connection); return new DataResponse( [ @@ -759,6 +765,7 @@ Raw output LegacySSEKeyFormat::class => ['pass' => $legacySSEKeyFormat->run(), 'description' => $legacySSEKeyFormat->description(), 'severity' => $legacySSEKeyFormat->severity(), 'linkToDocumentation' => $legacySSEKeyFormat->linkToDocumentation()], CheckUserCertificates::class => ['pass' => $checkUserCertificates->run(), 'description' => $checkUserCertificates->description(), 'severity' => $checkUserCertificates->severity(), 'elements' => $checkUserCertificates->elements()], 'isDefaultPhoneRegionSet' => $this->config->getSystemValueString('default_phone_region', '') !== '', + SupportedDatabase::class => ['pass' => $supportedDatabases->run(), 'description' => $supportedDatabases->description(), 'severity' => $supportedDatabases->severity()], ] ); } -- cgit v1.2.3