Fix psalm errors

Signed-off-by: Joas Schilling <coding@schilljs.com>

core/Command/Upgrade.php

@@ -37,8 +37,8 @@ use OC\Console\TimestampFormatter;
 use OC\Installer;
 use OC\Updater;
 use OCP\IConfig;
-use OCP\ILogger;
 use OCP\Util;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
@@ -56,15 +56,13 @@ class Upgrade extends Command {
 	/** @var IConfig */
 	private $config;
 
-	/** @var ILogger */
+	/** @var LoggerInterface */
 	private $logger;
 
-	/**
+	/** @var Installer */
-	 * @param IConfig $config
+	private $installer;
-	 * @param ILogger $logger
+
-	 * @param Installer $installer
+	public function __construct(IConfig $config, LoggerInterface $logger, Installer $installer) {
-	 */
-	public function __construct(IConfig $config, ILogger $logger, Installer $installer) {
 		parent::__construct();
 		$this->config = $config;
 		$this->logger = $logger;

core/ajax/update.php

@@ -117,7 +117,7 @@ if (\OCP\Util::needUpgrade()) {
 	// avoid side effects
 	\OC_User::setIncognitoMode(true);
 
-	$logger = \OC::$server->getLogger();
+	$logger = \OC::$server->get(\Psr\Log\LoggerInterface::class);
 	$config = \OC::$server->getConfig();
 	$updater = new \OC\Updater(
 			$config,

core/register_command.php

@@ -160,7 +160,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
 	$application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
 
-	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->query(\OC\Installer::class)));
+	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->query(\OC\Installer::class)));
 	$application->add(new OC\Core\Command\Maintenance\Repair(
 		new \OC\Repair([], \OC::$server->getEventDispatcher(), \OC::$server->get(LoggerInterface::class)),
 		\OC::$server->getConfig(),

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)
 			);

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, [
+			$this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [
-				'message' => 'Can not create a new MySQL user, will continue with the provided user.',
+				'exception' => $ex,
-				'level' => ILogger::INFO,
 				'app' => 'mysql.setup',
 			]);
 		}

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->error('Error while trying to create database', [
-				$this->logger->logException($e);
+					'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->error('Error while trying to restrict database permissions', [
-				$this->logger->logException($e);
+					'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->error('Error while trying to create database user', [
-			$this->logger->logException($e);
+				'exception' => $e,
+			]);
 		}
 	}
 }