From 5a8f15e1677b10880193b9bb1cee00666f49d51c Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Tue, 12 Jan 2021 09:26:20 +0100
Subject: [PATCH 1/2] Update psalm baseline to remove obsolete stuff

As seen in CI static checks, some blocks in the baseline were not needed any
more.

This will fix static checks in CI.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 build/psalm-baseline.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 780c3051ac..fc782b00bb 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3038,9 +3038,6 @@
     <InvalidArrayOffset occurrences="1">
       <code>$action['url-postfix']</code>
     </InvalidArrayOffset>
-    <RedundantCondition occurrences="1">
-      <code>strtolower</code>
-    </RedundantCondition>
   </file>
   <file src="lib/private/AppFramework/Services/AppConfig.php">
     <MoreSpecificImplementedParamType occurrences="1">
@@ -5035,11 +5032,6 @@
       <code>$this-&gt;appendIfExist($this-&gt;serverroot, 'core/'.$script.'.js')</code>
     </InvalidOperand>
   </file>
-  <file src="lib/private/Template/SCSSCacher.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>Compiler::LINE_COMMENTS</code>
-    </InvalidScalarArgument>
-  </file>
   <file src="lib/private/TemplateLayout.php">
     <InvalidParamDefault occurrences="2">
       <code>string</code>

From eeac11a687a401daf18eddafffa4f533cb3554b9 Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Tue, 12 Jan 2021 09:39:18 +0100
Subject: [PATCH 2/2] Fix casing of MySQLPlatform class name

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 apps/settings/lib/SetupChecks/SupportedDatabase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/settings/lib/SetupChecks/SupportedDatabase.php b/apps/settings/lib/SetupChecks/SupportedDatabase.php
index ac9138abfc..11227fc236 100644
--- a/apps/settings/lib/SetupChecks/SupportedDatabase.php
+++ b/apps/settings/lib/SetupChecks/SupportedDatabase.php
@@ -29,7 +29,7 @@ namespace OCA\Settings\SetupChecks;
 use Doctrine\DBAL\Platforms\MariaDb1027Platform;
 use Doctrine\DBAL\Platforms\MySQL57Platform;
 use Doctrine\DBAL\Platforms\MySQL80Platform;
-use Doctrine\DBAL\Platforms\MySqlPlatform;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\PostgreSQL100Platform;
 use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
@@ -61,7 +61,7 @@ class SupportedDatabase {
 			case MySQL80Platform::class: # extends MySQL57Platform
 			case MySQL57Platform::class: # extends MySQLPlatform
 			case MariaDb1027Platform::class: # extends MySQLPlatform
-			case MySqlPlatform::class:
+			case MySQLPlatform::class:
 				$result = $this->connection->prepare('SHOW VARIABLES LIKE "version";');
 				$result->execute();
 				$row = $result->fetch();