Fixing psalm errors

Encryption constructor is problematic and should still be fixed later.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/31609/head
Côme Chilliet 3 years ago
parent ea23523c70
commit e8c1f75064
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
  1. 2
      core/register_command.php
  2. 18
      lib/private/Files/Storage/Wrapper/Encryption.php

@ -104,7 +104,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\Config\System\SetConfig(\OC::$server->getSystemConfig()));
$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->getLogger()));
$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->get(LoggerInterface::class)));
$application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->get(\OC\DB\Connection::class)));
$application->add(new OC\Core\Command\Db\AddMissingIndices(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));
$application->add(new OC\Core\Command\Db\AddMissingColumns(\OC::$server->get(\OC\DB\Connection::class), \OC::$server->getEventDispatcher()));

@ -98,15 +98,15 @@ class Encryption extends Wrapper {
*/
public function __construct(
$parameters,
IManager $encryptionManager,
Util $util,
LoggerInterface $logger,
IFile $fileHelper,
string $uid,
IStorage $keyStorage,
Update $update,
Manager $mountManager,
ArrayCache $arrayCache
IManager $encryptionManager = null,
Util $util = null,
LoggerInterface $logger = null,
IFile $fileHelper = null,
$uid = null,
IStorage $keyStorage = null,
Update $update = null,
Manager $mountManager = null,
ArrayCache $arrayCache = null
) {
$this->mountPoint = $parameters['mountPoint'];
$this->mount = $parameters['mount'];

Loading…
Cancel
Save