1 files changed, 63 insertions, 32 deletions

diff --git a/apps/settings/lib/SetupChecks/SupportedDatabase.php b/apps/settings/lib/SetupChecks/SupportedDatabase.php
index 5739bc17958..d083958d16e 100644
--- a/apps/settings/lib/SetupChecks/SupportedDatabase.php
+++ b/apps/settings/lib/SetupChecks/SupportedDatabase.php
@@ -3,27 +3,8 @@
 declare(strict_types=1);
 
 /**
- * @copyright Copyright (c) 2021 Morris Jobke <hey@morrisjobke.de>
- *
- * @author Claas Augner <github@caugner.de>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Vincent Petry <vincent@nextcloud.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OCA\Settings\SetupChecks;
 
@@ -38,6 +19,14 @@ use OCP\SetupCheck\ISetupCheck;
 use OCP\SetupCheck\SetupResult;
 
 class SupportedDatabase implements ISetupCheck {
+
+	private const MIN_MARIADB = '10.6';
+	private const MAX_MARIADB = '11.8';
+	private const MIN_MYSQL = '8.0';
+	private const MAX_MYSQL = '8.4';
+	private const MIN_POSTGRES = '13';
+	private const MAX_POSTGRES = '17';
+
 	public function __construct(
 		private IL10N $l10n,
 		private IURLGenerator $urlGenerator,
@@ -57,28 +46,70 @@ class SupportedDatabase implements ISetupCheck {
 		$version = null;
 		$databasePlatform = $this->connection->getDatabasePlatform();
 		if ($databasePlatform instanceof MySQLPlatform) {
-			$result = $this->connection->prepare("SHOW VARIABLES LIKE 'version';");
-			$result->execute();
+			$statement = $this->connection->prepare("SHOW VARIABLES LIKE 'version';");
+			$result = $statement->execute();
 			$row = $result->fetch();
 			$version = $row['Value'];
 			$versionlc = strtolower($version);
-
+			// we only care about X.Y not X.Y.Z differences
+			[$major, $minor, ] = explode('.', $versionlc);
+			$versionConcern = $major . '.' . $minor;
 			if (str_contains($versionlc, 'mariadb')) {
-				if (version_compare($versionlc, '10.2', '<')) {
-					return SetupResult::warning($this->l10n->t('MariaDB version "%s" is used. Nextcloud 21 and higher do not support this version and require MariaDB 10.2 or higher.', $version));
+				if (version_compare($versionConcern, '10.3', '=')) {
+					return SetupResult::info(
+						$this->l10n->t(
+							'MariaDB version 10.3 detected, this version is end-of-life and only supported as part of Ubuntu 20.04. MariaDB >=%1$s and <=%2$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
+							[
+								self::MIN_MARIADB,
+								self::MAX_MARIADB,
+							]
+						),
+					);
+				} elseif (version_compare($versionConcern, self::MIN_MARIADB, '<') || version_compare($versionConcern, self::MAX_MARIADB, '>')) {
+					return SetupResult::warning(
+						$this->l10n->t(
+							'MariaDB version "%1$s" detected. MariaDB >=%2$s and <=%3$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
+							[
+								$version,
+								self::MIN_MARIADB,
+								self::MAX_MARIADB,
+							],
+						),
+					);
 				}
 			} else {
-				if (version_compare($versionlc, '8', '<')) {
-					return SetupResult::warning($this->l10n->t('MySQL version "%s" is used. Nextcloud 21 and higher do not support this version and require MySQL 8.0 or MariaDB 10.2 or higher.', $version));
+				if (version_compare($versionConcern, self::MIN_MYSQL, '<') || version_compare($versionConcern, self::MAX_MYSQL, '>')) {
+					return SetupResult::warning(
+						$this->l10n->t(
+							'MySQL version "%1$s" detected. MySQL >=%2$s and <=%3$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
+							[
+								$version,
+								self::MIN_MYSQL,
+								self::MAX_MYSQL,
+							],
+						),
+					);
 				}
 			}
 		} elseif ($databasePlatform instanceof PostgreSQLPlatform) {
-			$result = $this->connection->prepare('SHOW server_version;');
-			$result->execute();
+			$statement = $this->connection->prepare('SHOW server_version;');
+			$result = $statement->execute();
 			$row = $result->fetch();
 			$version = $row['server_version'];
-			if (version_compare(strtolower($version), '9.6', '<')) {
-				return SetupResult::warning($this->l10n->t('PostgreSQL version "%s" is used. Nextcloud 21 and higher do not support this version and require PostgreSQL 9.6 or higher.', $version));
+			$versionlc = strtolower($version);
+			// we only care about X not X.Y or X.Y.Z differences
+			[$major, ] = explode('.', $versionlc);
+			$versionConcern = $major;
+			if (version_compare($versionConcern, self::MIN_POSTGRES, '<') || version_compare($versionConcern, self::MAX_POSTGRES, '>')) {
+				return SetupResult::warning(
+					$this->l10n->t(
+						'PostgreSQL version "%1$s" detected. PostgreSQL >=%2$s and <=%3$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
+						[
+							$version,
+							self::MIN_POSTGRES,
+							self::MAX_POSTGRES,
+						])
+				);
 			}
 		} elseif ($databasePlatform instanceof OraclePlatform) {
 			$version = 'Oracle';