diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2021-01-12 10:14:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 10:14:11 +0100 |
| commit | 15924b8832fef063f78ba189b1f2d68049e36779 (patch) | |
| tree | 49984b5a000ee880926eb67d0e27a1b1a174de34 | |
| parent | c8cbb73c05714f035eb63fe91873fc43e0557f1c (diff) | |
| parent | eeac11a687a401daf18eddafffa4f533cb3554b9 (diff) | |
| download | nextcloud-server-15924b8832fef063f78ba189b1f2d68049e36779.tar.gz nextcloud-server-15924b8832fef063f78ba189b1f2d68049e36779.zip | |
Merge pull request #25087 from nextcloud/techdebt/noid/update-psalm-baseline-as-recommended.xml
Update psalm baseline to remove obsolete stuff
| -rw-r--r-- | apps/settings/lib/SetupChecks/SupportedDatabase.php | 4 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/apps/settings/lib/SetupChecks/SupportedDatabase.php b/apps/settings/lib/SetupChecks/SupportedDatabase.php index ac9138abfc6..11227fc236f 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(); diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 780c3051ac1..fc782b00bb4 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->appendIfExist($this->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> |