From 167efa19d706b1e430343554cdecd513cbb6610e Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 22 Apr 2021 15:22:50 +0200
Subject: Fix psalm errors

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/base.php                     |  2 +-
 lib/private/Setup/MySQL.php      |  9 +++++----
 lib/private/Setup/PostgreSQL.php | 24 +++++++++++++++---------
 3 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/base.php b/lib/base.php
index 7e3f6d9567b..76d35ba754c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -929,7 +929,7 @@ class OC {
 				\OC::$server->get(\bantu\IniGetWrapper\IniGetWrapper::class),
 				\OC::$server->getL10N('lib'),
 				\OC::$server->query(\OCP\Defaults::class),
-				\OC::$server->getLogger(),
+				\OC::$server->get(\Psr\Log\LoggerInterface::class),
 				\OC::$server->getSecureRandom(),
 				\OC::$server->query(\OC\Installer::class)
 			);
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index c2b0cd8aaac..7b90e1f715c 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -66,7 +66,9 @@ class MySQL extends AbstractDatabase {
 		try {
 			$connection->connect();
 		} catch (\Exception $e) {
-			$this->logger->logException($e);
+			$this->logger->error($e->getMessage(), [
+				'exception' => $e,
+			]);
 			throw new \OC\DatabaseSetupException($this->trans->t('MySQL username and/or password not valid'),
 				$this->trans->t('You need to enter details of an existing account.'), 0, $e);
 		}
@@ -177,9 +179,8 @@ class MySQL extends AbstractDatabase {
 				}
 			}
 		} catch (\Exception $ex) {
-			$this->logger->logException($ex, [
-				'message' => 'Can not create a new MySQL user, will continue with the provided user.',
-				'level' => ILogger::INFO,
+			$this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [
+				'exception' => $ex,
 				'app' => 'mysql.setup',
 			]);
 		}
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
index 7e59bf297f1..40386666341 100644
--- a/lib/private/Setup/PostgreSQL.php
+++ b/lib/private/Setup/PostgreSQL.php
@@ -82,8 +82,9 @@ class PostgreSQL extends AbstractDatabase {
 			// the connection to dbname=postgres is not needed anymore
 			$connection->close();
 		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			$this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created');
+			$this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created', [
+				'exception' => $e,
+			]);
 			$this->config->setValues([
 				'dbuser' => $this->dbUser,
 				'dbpassword' => $this->dbPassword,
@@ -97,7 +98,9 @@ class PostgreSQL extends AbstractDatabase {
 		try {
 			$connection->connect();
 		} catch (\Exception $e) {
-			$this->logger->logException($e);
+			$this->logger->error($e->getMessage(), [
+				'exception' => $e,
+			]);
 			throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
 				$this->trans->t('You need to enter details of an existing account.'), 0, $e);
 		}
@@ -110,16 +113,18 @@ class PostgreSQL extends AbstractDatabase {
 			try {
 				$query->execute();
 			} catch (DatabaseException $e) {
-				$this->logger->error('Error while trying to create database');
-				$this->logger->logException($e);
+				$this->logger->error('Error while trying to create database', [
+					'exception' => $e,
+				]);
 			}
 		} else {
 			$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
 			try {
 				$query->execute();
 			} catch (DatabaseException $e) {
-				$this->logger->error('Error while trying to restrict database permissions');
-				$this->logger->logException($e);
+				$this->logger->error('Error while trying to restrict database permissions', [
+					'exception' => $e,
+				]);
 			}
 		}
 	}
@@ -161,8 +166,9 @@ class PostgreSQL extends AbstractDatabase {
 				$query->execute();
 			}
 		} catch (DatabaseException $e) {
-			$this->logger->error('Error while trying to create database user');
-			$this->logger->logException($e);
+			$this->logger->error('Error while trying to create database user', [
+				'exception' => $e,
+			]);
 		}
 	}
 }
-- 
cgit v1.2.3