nextcloud / server

tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php

Indentation +252 added lines, -252 removed lines

@@ -18,256 +18,256 @@
 
 #[\PHPUnit\Framework\Attributes\Group('DB')]
 class ExpressionBuilderDBTest extends TestCase {
-	/** @var \Doctrine\DBAL\Connection|IDBConnection */
-	protected $connection;
-	protected $schemaSetup = false;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->connection = Server::get(IDBConnection::class);
-		$this->prepareTestingTable();
-	}
-
-	public static function likeProvider(): array {
-		$connection = Server::get(IDBConnection::class);
-
-		return [
-			['foo', 'bar', false],
-			['foo', 'foo', true],
-			['foo', 'f%', true],
-			['foo', '%o', true],
-			['foo', '%', true],
-			['foo', 'fo_', true],
-			['foo', 'foo_', false],
-			['foo', $connection->escapeLikeParameter('fo_'), false],
-			['foo', $connection->escapeLikeParameter('f%'), false],
-		];
-	}
-
-	/**
-	 *
-	 * @param string $param1
-	 * @param string $param2
-	 * @param boolean $match
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('likeProvider')]
-	public function testLike($param1, $param2, $match): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$query->select(new Literal('1'))
-			->from('users')
-			->where($query->expr()->like($query->createNamedParameter($param1), $query->createNamedParameter($param2)));
-
-		$result = $query->executeQuery();
-		$column = $result->fetchOne();
-		$result->closeCursor();
-		$this->assertEquals($match, $column);
-	}
-
-	public static function ilikeProvider(): array {
-		$connection = Server::get(IDBConnection::class);
-
-		return [
-			['foo', 'bar', false],
-			['foo', 'foo', true],
-			['foo', 'Foo', true],
-			['foo', 'f%', true],
-			['foo', '%o', true],
-			['foo', '%', true],
-			['foo', 'fo_', true],
-			['foo', 'foo_', false],
-			['foo', $connection->escapeLikeParameter('fo_'), false],
-			['foo', $connection->escapeLikeParameter('f%'), false],
-		];
-	}
-
-	/**
-	 *
-	 * @param string $param1
-	 * @param string $param2
-	 * @param boolean $match
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('ilikeProvider')]
-	public function testILike($param1, $param2, $match): void {
-		$query = $this->connection->getQueryBuilder();
-
-		$query->select(new Literal('1'))
-			->from('users')
-			->where($query->expr()->iLike($query->createNamedParameter($param1), $query->createNamedParameter($param2)));
-
-		$result = $query->executeQuery();
-		$column = $result->fetchOne();
-		$result->closeCursor();
-		$this->assertEquals($match, $column);
-	}
-
-	public function testCastColumn(): void {
-		$appId = $this->getUniqueID('testing');
-		$this->createConfig($appId, '1', '4');
-
-		$query = $this->connection->getQueryBuilder();
-		$query->update('appconfig')
-			->set('configvalue',
-				$query->expr()->castColumn(
-					$query->createFunction(
-						'(' . $query->expr()->castColumn('configvalue', IQueryBuilder::PARAM_INT)
-						. ' + 1)'
-					), IQueryBuilder::PARAM_STR
-				)
-			)
-			->where($query->expr()->eq('appid', $query->createNamedParameter($appId)))
-			->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('1')));
-
-		$result = $query->executeStatement();
-		$this->assertEquals(1, $result);
-	}
-
-	public function testLongText(): void {
-		$appId = $this->getUniqueID('testing');
-		$this->createConfig($appId, 'mykey', 'myvalue');
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('appconfig')
-			->where($query->expr()->eq('appid', $query->createNamedParameter($appId)))
-			->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('mykey')))
-			->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('myvalue', IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR));
-
-		$result = $query->executeQuery();
-		$entries = $result->fetchAllAssociative();
-		$result->closeCursor();
-		self::assertCount(1, $entries);
-		self::assertEquals('myvalue', $entries[0]['configvalue']);
-	}
-
-	public function testJson(): void {
-		$appId = $this->getUniqueID('testing');
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('share')
-			->values([
-				'uid_owner' => $query->createNamedParameter('uid_owner'),
-				'item_type' => $query->createNamedParameter('item_type'),
-				'permissions' => $query->createNamedParameter(0),
-				'stime' => $query->createNamedParameter(0),
-				'accepted' => $query->createNamedParameter(0),
-				'mail_send' => $query->createNamedParameter(0),
-				'share_type' => $query->createNamedParameter(0),
-				'share_with' => $query->createNamedParameter($appId),
-				'attributes' => $query->createNamedParameter('[["permissions","before"]]'),
-			])
-			->executeStatement();
-
-		$query = $this->connection->getQueryBuilder();
-		$query->update('share')
-			->set('attributes', $query->createNamedParameter('[["permissions","after"]]'));
-		if ($this->connection->getDatabaseProvider(true) === IDBConnection::PLATFORM_MYSQL) {
-			$query->where($query->expr()->eq('attributes', $query->createFunction("JSON_ARRAY(JSON_ARRAY('permissions','before'))"), IQueryBuilder::PARAM_JSON));
-		} else {
-			$query->where($query->expr()->eq('attributes', $query->createNamedParameter('[["permissions","before"]]'), IQueryBuilder::PARAM_JSON));
-		}
-		$query->executeStatement();
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('attributes')
-			->from('share')
-			->where($query->expr()->eq('share_with', $query->createNamedParameter($appId)));
-
-		$result = $query->executeQuery();
-		$entries = $result->fetchAll();
-		$result->closeCursor();
-		self::assertCount(1, $entries);
-		self::assertEquals([['permissions','after']], json_decode($entries[0]['attributes'], true));
-	}
-
-	public function testDateTimeEquals(): void {
-		$dateTime = new \DateTime('2023-01-01');
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('testing')
-			->values(['datetime' => $insert->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)])
-			->executeStatement();
-
-		$query = $this->connection->getQueryBuilder();
-		$result = $query->select('*')
-			->from('testing')
-			->where($query->expr()->eq('datetime', $query->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)))
-			->executeQuery();
-		$entries = $result->fetchAllAssociative();
-		$result->closeCursor();
-		self::assertCount(1, $entries);
-	}
-
-	public function testDateTimeLess(): void {
-		$dateTime = new \DateTime('2022-01-01');
-		$dateTimeCompare = new \DateTime('2022-01-02');
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('testing')
-			->values(['datetime' => $insert->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)])
-			->executeStatement();
-
-		$query = $this->connection->getQueryBuilder();
-		$result = $query->select('*')
-			->from('testing')
-			->where($query->expr()->lt('datetime', $query->createNamedParameter($dateTimeCompare, IQueryBuilder::PARAM_DATETIME_MUTABLE)))
-			->executeQuery();
-		$entries = $result->fetchAllAssociative();
-		$result->closeCursor();
-		self::assertCount(1, $entries);
-	}
-
-	public function testDateTimeGreater(): void {
-		$dateTime = new \DateTime('2023-01-02');
-		$dateTimeCompare = new \DateTime('2023-01-01');
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('testing')
-			->values(['datetime' => $insert->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)])
-			->executeStatement();
-
-		$query = $this->connection->getQueryBuilder();
-		$result = $query->select('*')
-			->from('testing')
-			->where($query->expr()->gt('datetime', $query->createNamedParameter($dateTimeCompare, IQueryBuilder::PARAM_DATETIME_MUTABLE)))
-			->executeQuery();
-		$entries = $result->fetchAllAssociative();
-		$result->closeCursor();
-		self::assertCount(1, $entries);
-	}
-
-	protected function createConfig($appId, $key, $value) {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert('appconfig')
-			->values([
-				'appid' => $query->createNamedParameter($appId),
-				'configkey' => $query->createNamedParameter((string)$key),
-				'configvalue' => $query->createNamedParameter((string)$value),
-			])
-			->executeStatement();
-	}
-
-	protected function prepareTestingTable(): void {
-		if ($this->schemaSetup) {
-			$this->connection->getQueryBuilder()->delete('testing')->executeStatement();
-		}
-
-		$prefix = Server::get(IConfig::class)->getSystemValueString('dbtableprefix', 'oc_');
-		$schema = $this->connection->createSchema();
-		try {
-			$schema->getTable($prefix . 'testing');
-			$this->connection->getQueryBuilder()->delete('testing')->executeStatement();
-		} catch (SchemaException $e) {
-			$this->schemaSetup = true;
-			$table = $schema->createTable($prefix . 'testing');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-			]);
-
-			$table->addColumn('datetime', Types::DATETIME, [
-				'notnull' => false,
-			]);
-
-			$table->setPrimaryKey(['id']);
-			$this->connection->migrateToSchema($schema);
-		}
-	}
+    /** @var \Doctrine\DBAL\Connection|IDBConnection */
+    protected $connection;
+    protected $schemaSetup = false;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->connection = Server::get(IDBConnection::class);
+        $this->prepareTestingTable();
+    }
+
+    public static function likeProvider(): array {
+        $connection = Server::get(IDBConnection::class);
+
+        return [
+            ['foo', 'bar', false],
+            ['foo', 'foo', true],
+            ['foo', 'f%', true],
+            ['foo', '%o', true],
+            ['foo', '%', true],
+            ['foo', 'fo_', true],
+            ['foo', 'foo_', false],
+            ['foo', $connection->escapeLikeParameter('fo_'), false],
+            ['foo', $connection->escapeLikeParameter('f%'), false],
+        ];
+    }
+
+    /**
+     *
+     * @param string $param1
+     * @param string $param2
+     * @param boolean $match
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('likeProvider')]
+    public function testLike($param1, $param2, $match): void {
+        $query = $this->connection->getQueryBuilder();
+
+        $query->select(new Literal('1'))
+            ->from('users')
+            ->where($query->expr()->like($query->createNamedParameter($param1), $query->createNamedParameter($param2)));
+
+        $result = $query->executeQuery();
+        $column = $result->fetchOne();
+        $result->closeCursor();
+        $this->assertEquals($match, $column);
+    }
+
+    public static function ilikeProvider(): array {
+        $connection = Server::get(IDBConnection::class);
+
+        return [
+            ['foo', 'bar', false],
+            ['foo', 'foo', true],
+            ['foo', 'Foo', true],
+            ['foo', 'f%', true],
+            ['foo', '%o', true],
+            ['foo', '%', true],
+            ['foo', 'fo_', true],
+            ['foo', 'foo_', false],
+            ['foo', $connection->escapeLikeParameter('fo_'), false],
+            ['foo', $connection->escapeLikeParameter('f%'), false],
+        ];
+    }
+
+    /**
+     *
+     * @param string $param1
+     * @param string $param2
+     * @param boolean $match
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('ilikeProvider')]
+    public function testILike($param1, $param2, $match): void {
+        $query = $this->connection->getQueryBuilder();
+
+        $query->select(new Literal('1'))
+            ->from('users')
+            ->where($query->expr()->iLike($query->createNamedParameter($param1), $query->createNamedParameter($param2)));
+
+        $result = $query->executeQuery();
+        $column = $result->fetchOne();
+        $result->closeCursor();
+        $this->assertEquals($match, $column);
+    }
+
+    public function testCastColumn(): void {
+        $appId = $this->getUniqueID('testing');
+        $this->createConfig($appId, '1', '4');
+
+        $query = $this->connection->getQueryBuilder();
+        $query->update('appconfig')
+            ->set('configvalue',
+                $query->expr()->castColumn(
+                    $query->createFunction(
+                        '(' . $query->expr()->castColumn('configvalue', IQueryBuilder::PARAM_INT)
+                        . ' + 1)'
+                    ), IQueryBuilder::PARAM_STR
+                )
+            )
+            ->where($query->expr()->eq('appid', $query->createNamedParameter($appId)))
+            ->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('1')));
+
+        $result = $query->executeStatement();
+        $this->assertEquals(1, $result);
+    }
+
+    public function testLongText(): void {
+        $appId = $this->getUniqueID('testing');
+        $this->createConfig($appId, 'mykey', 'myvalue');
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('appconfig')
+            ->where($query->expr()->eq('appid', $query->createNamedParameter($appId)))
+            ->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('mykey')))
+            ->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('myvalue', IQueryBuilder::PARAM_STR), IQueryBuilder::PARAM_STR));
+
+        $result = $query->executeQuery();
+        $entries = $result->fetchAllAssociative();
+        $result->closeCursor();
+        self::assertCount(1, $entries);
+        self::assertEquals('myvalue', $entries[0]['configvalue']);
+    }
+
+    public function testJson(): void {
+        $appId = $this->getUniqueID('testing');
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('share')
+            ->values([
+                'uid_owner' => $query->createNamedParameter('uid_owner'),
+                'item_type' => $query->createNamedParameter('item_type'),
+                'permissions' => $query->createNamedParameter(0),
+                'stime' => $query->createNamedParameter(0),
+                'accepted' => $query->createNamedParameter(0),
+                'mail_send' => $query->createNamedParameter(0),
+                'share_type' => $query->createNamedParameter(0),
+                'share_with' => $query->createNamedParameter($appId),
+                'attributes' => $query->createNamedParameter('[["permissions","before"]]'),
+            ])
+            ->executeStatement();
+
+        $query = $this->connection->getQueryBuilder();
+        $query->update('share')
+            ->set('attributes', $query->createNamedParameter('[["permissions","after"]]'));
+        if ($this->connection->getDatabaseProvider(true) === IDBConnection::PLATFORM_MYSQL) {
+            $query->where($query->expr()->eq('attributes', $query->createFunction("JSON_ARRAY(JSON_ARRAY('permissions','before'))"), IQueryBuilder::PARAM_JSON));
+        } else {
+            $query->where($query->expr()->eq('attributes', $query->createNamedParameter('[["permissions","before"]]'), IQueryBuilder::PARAM_JSON));
+        }
+        $query->executeStatement();
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('attributes')
+            ->from('share')
+            ->where($query->expr()->eq('share_with', $query->createNamedParameter($appId)));
+
+        $result = $query->executeQuery();
+        $entries = $result->fetchAll();
+        $result->closeCursor();
+        self::assertCount(1, $entries);
+        self::assertEquals([['permissions','after']], json_decode($entries[0]['attributes'], true));
+    }
+
+    public function testDateTimeEquals(): void {
+        $dateTime = new \DateTime('2023-01-01');
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('testing')
+            ->values(['datetime' => $insert->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)])
+            ->executeStatement();
+
+        $query = $this->connection->getQueryBuilder();
+        $result = $query->select('*')
+            ->from('testing')
+            ->where($query->expr()->eq('datetime', $query->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)))
+            ->executeQuery();
+        $entries = $result->fetchAllAssociative();
+        $result->closeCursor();
+        self::assertCount(1, $entries);
+    }
+
+    public function testDateTimeLess(): void {
+        $dateTime = new \DateTime('2022-01-01');
+        $dateTimeCompare = new \DateTime('2022-01-02');
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('testing')
+            ->values(['datetime' => $insert->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)])
+            ->executeStatement();
+
+        $query = $this->connection->getQueryBuilder();
+        $result = $query->select('*')
+            ->from('testing')
+            ->where($query->expr()->lt('datetime', $query->createNamedParameter($dateTimeCompare, IQueryBuilder::PARAM_DATETIME_MUTABLE)))
+            ->executeQuery();
+        $entries = $result->fetchAllAssociative();
+        $result->closeCursor();
+        self::assertCount(1, $entries);
+    }
+
+    public function testDateTimeGreater(): void {
+        $dateTime = new \DateTime('2023-01-02');
+        $dateTimeCompare = new \DateTime('2023-01-01');
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('testing')
+            ->values(['datetime' => $insert->createNamedParameter($dateTime, IQueryBuilder::PARAM_DATETIME_MUTABLE)])
+            ->executeStatement();
+
+        $query = $this->connection->getQueryBuilder();
+        $result = $query->select('*')
+            ->from('testing')
+            ->where($query->expr()->gt('datetime', $query->createNamedParameter($dateTimeCompare, IQueryBuilder::PARAM_DATETIME_MUTABLE)))
+            ->executeQuery();
+        $entries = $result->fetchAllAssociative();
+        $result->closeCursor();
+        self::assertCount(1, $entries);
+    }
+
+    protected function createConfig($appId, $key, $value) {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert('appconfig')
+            ->values([
+                'appid' => $query->createNamedParameter($appId),
+                'configkey' => $query->createNamedParameter((string)$key),
+                'configvalue' => $query->createNamedParameter((string)$value),
+            ])
+            ->executeStatement();
+    }
+
+    protected function prepareTestingTable(): void {
+        if ($this->schemaSetup) {
+            $this->connection->getQueryBuilder()->delete('testing')->executeStatement();
+        }
+
+        $prefix = Server::get(IConfig::class)->getSystemValueString('dbtableprefix', 'oc_');
+        $schema = $this->connection->createSchema();
+        try {
+            $schema->getTable($prefix . 'testing');
+            $this->connection->getQueryBuilder()->delete('testing')->executeStatement();
+        } catch (SchemaException $e) {
+            $this->schemaSetup = true;
+            $table = $schema->createTable($prefix . 'testing');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+            ]);
+
+            $table->addColumn('datetime', Types::DATETIME, [
+                'notnull' => false,
+            ]);
+
+            $table->setPrimaryKey(['id']);
+            $this->connection->migrateToSchema($schema);
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -111,7 +111,7 @@ 
 			->set('configvalue',
 				$query->expr()->castColumn(
 					$query->createFunction(
-						'(' . $query->expr()->castColumn('configvalue', IQueryBuilder::PARAM_INT)
+						'('.$query->expr()->castColumn('configvalue', IQueryBuilder::PARAM_INT)
 						. ' + 1)'
 					), IQueryBuilder::PARAM_STR
 				)
@@ -177,7 +177,7 @@ 
 		$entries = $result->fetchAll();
 		$result->closeCursor();
 		self::assertCount(1, $entries);
-		self::assertEquals([['permissions','after']], json_decode($entries[0]['attributes'], true));
+		self::assertEquals([['permissions', 'after']], json_decode($entries[0]['attributes'], true));
 	}
 
 	public function testDateTimeEquals(): void {
@@ -238,8 +238,8 @@ 
 		$query->insert('appconfig')
 			->values([
 				'appid' => $query->createNamedParameter($appId),
-				'configkey' => $query->createNamedParameter((string)$key),
-				'configvalue' => $query->createNamedParameter((string)$value),
+				'configkey' => $query->createNamedParameter((string) $key),
+				'configvalue' => $query->createNamedParameter((string) $value),
 			])
 			->executeStatement();
 	}
@@ -252,11 +252,11 @@ 
 		$prefix = Server::get(IConfig::class)->getSystemValueString('dbtableprefix', 'oc_');
 		$schema = $this->connection->createSchema();
 		try {
-			$schema->getTable($prefix . 'testing');
+			$schema->getTable($prefix.'testing');
 			$this->connection->getQueryBuilder()->delete('testing')->executeStatement();
 		} catch (SchemaException $e) {
 			$this->schemaSetup = true;
-			$table = $schema->createTable($prefix . 'testing');
+			$table = $schema->createTable($prefix.'testing');
 			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,

apps/settings/lib/SetupChecks/SupportedDatabase.php

Indentation +122 added lines, -122 removed lines

@@ -16,130 +16,130 @@
 
 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 = '14';
-	private const MAX_POSTGRES = '18';
-	private const MIN_ORACLE = '12.2';
-	private const MAX_ORACLE = '26';
+    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 = '14';
+    private const MAX_POSTGRES = '18';
+    private const MIN_ORACLE = '12.2';
+    private const MAX_ORACLE = '26';
 
-	public function __construct(
-		private IL10N $l10n,
-		private IURLGenerator $urlGenerator,
-		private IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        private IL10N $l10n,
+        private IURLGenerator $urlGenerator,
+        private IDBConnection $connection,
+    ) {
+    }
 
-	public function getCategory(): string {
-		return 'database';
-	}
+    public function getCategory(): string {
+        return 'database';
+    }
 
-	public function getName(): string {
-		return $this->l10n->t('Database version');
-	}
+    public function getName(): string {
+        return $this->l10n->t('Database version');
+    }
 
-	public function run(): SetupResult {
-		$databasePlatform = $this->connection->getDatabaseProvider();
-		if ($databasePlatform === IDBConnection::PLATFORM_MYSQL || $databasePlatform === IDBConnection::PLATFORM_MARIADB) {
-			$statement = $this->connection->prepare("SHOW VARIABLES LIKE 'version';");
-			$result = $statement->execute();
-			$row = $result->fetchAssociative();
-			$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($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($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 === IDBConnection::PLATFORM_POSTGRES) {
-			$statement = $this->connection->prepare('SHOW server_version;');
-			$result = $statement->execute();
-			$row = $result->fetchAssociative();
-			$version = $row['server_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 === IDBConnection::PLATFORM_ORACLE) {
-			$result = $this->connection->executeQuery('SELECT VERSION FROM PRODUCT_COMPONENT_VERSION');
-			$version = $result->fetchOne();
-			$result->closeCursor();
-			$versionLower = strtolower($version);
-			// we only care about X.Y not X.Y.Z differences
-			[$major, $minor, ] = explode('.', $versionLower);
-			$versionConcern = $major . '.' . $minor;
-			if (version_compare($versionConcern, self::MIN_ORACLE, '<') || version_compare($versionConcern, self::MAX_ORACLE, '>')) {
-				$extendedWarning = '';
-				if (version_compare($versionConcern, self::MIN_ORACLE, '<')) {
-					$extendedWarning = "\n" . $this->l10n->t('Nextcloud %d does not support your current version, so be sure to update the database before updating your Nextcloud Server.', [33]);
-				}
-				return SetupResult::warning(
-					$this->l10n->t(
-						'Oracle version "%1$s" detected. Oracle >=%2$s and <=%3$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
-						[
-							$version,
-							self::MIN_ORACLE,
-							self::MAX_ORACLE,
-						])
-					. $extendedWarning
-				);
-			}
-		} elseif ($databasePlatform === IDBConnection::PLATFORM_SQLITE) {
-			return SetupResult::warning(
-				$this->l10n->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend. This is particularly recommended when using the desktop client for file synchronisation. To migrate to another database use the command line tool: "occ db:convert-type".'),
-				$this->urlGenerator->linkToDocs('admin-db-conversion')
-			);
-		} else {
-			return SetupResult::error($this->l10n->t('Unknown database platform'));
-		}
-		return SetupResult::success($version);
-	}
+    public function run(): SetupResult {
+        $databasePlatform = $this->connection->getDatabaseProvider();
+        if ($databasePlatform === IDBConnection::PLATFORM_MYSQL || $databasePlatform === IDBConnection::PLATFORM_MARIADB) {
+            $statement = $this->connection->prepare("SHOW VARIABLES LIKE 'version';");
+            $result = $statement->execute();
+            $row = $result->fetchAssociative();
+            $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($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($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 === IDBConnection::PLATFORM_POSTGRES) {
+            $statement = $this->connection->prepare('SHOW server_version;');
+            $result = $statement->execute();
+            $row = $result->fetchAssociative();
+            $version = $row['server_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 === IDBConnection::PLATFORM_ORACLE) {
+            $result = $this->connection->executeQuery('SELECT VERSION FROM PRODUCT_COMPONENT_VERSION');
+            $version = $result->fetchOne();
+            $result->closeCursor();
+            $versionLower = strtolower($version);
+            // we only care about X.Y not X.Y.Z differences
+            [$major, $minor, ] = explode('.', $versionLower);
+            $versionConcern = $major . '.' . $minor;
+            if (version_compare($versionConcern, self::MIN_ORACLE, '<') || version_compare($versionConcern, self::MAX_ORACLE, '>')) {
+                $extendedWarning = '';
+                if (version_compare($versionConcern, self::MIN_ORACLE, '<')) {
+                    $extendedWarning = "\n" . $this->l10n->t('Nextcloud %d does not support your current version, so be sure to update the database before updating your Nextcloud Server.', [33]);
+                }
+                return SetupResult::warning(
+                    $this->l10n->t(
+                        'Oracle version "%1$s" detected. Oracle >=%2$s and <=%3$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
+                        [
+                            $version,
+                            self::MIN_ORACLE,
+                            self::MAX_ORACLE,
+                        ])
+                    . $extendedWarning
+                );
+            }
+        } elseif ($databasePlatform === IDBConnection::PLATFORM_SQLITE) {
+            return SetupResult::warning(
+                $this->l10n->t('SQLite is currently being used as the backend database. For larger installations we recommend that you switch to a different database backend. This is particularly recommended when using the desktop client for file synchronisation. To migrate to another database use the command line tool: "occ db:convert-type".'),
+                $this->urlGenerator->linkToDocs('admin-db-conversion')
+            );
+        } else {
+            return SetupResult::error($this->l10n->t('Unknown database platform'));
+        }
+        return SetupResult::success($version);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 			$versionlc = strtolower($version);
 			// we only care about X.Y not X.Y.Z differences
 			[$major, $minor, ] = explode('.', $versionlc);
-			$versionConcern = $major . '.' . $minor;
+			$versionConcern = $major.'.'.$minor;
 			if (str_contains($versionlc, 'mariadb')) {
 				if (version_compare($versionConcern, '10.3', '=')) {
 					return SetupResult::info(
@@ -115,11 +115,11 @@ 
 			$versionLower = strtolower($version);
 			// we only care about X.Y not X.Y.Z differences
 			[$major, $minor, ] = explode('.', $versionLower);
-			$versionConcern = $major . '.' . $minor;
+			$versionConcern = $major.'.'.$minor;
 			if (version_compare($versionConcern, self::MIN_ORACLE, '<') || version_compare($versionConcern, self::MAX_ORACLE, '>')) {
 				$extendedWarning = '';
 				if (version_compare($versionConcern, self::MIN_ORACLE, '<')) {
-					$extendedWarning = "\n" . $this->l10n->t('Nextcloud %d does not support your current version, so be sure to update the database before updating your Nextcloud Server.', [33]);
+					$extendedWarning = "\n".$this->l10n->t('Nextcloud %d does not support your current version, so be sure to update the database before updating your Nextcloud Server.', [33]);
 				}
 				return SetupResult::warning(
 					$this->l10n->t(