diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-03-21 10:14:16 +0100 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-03-24 16:21:26 +0100 |
| commit | e8c1f75064ae008e50daa087924de5d29368747e (patch) | |
| tree | 86510495360048a707cb009805c1f00d1fbe5742 | |
| parent | ea23523c70ee562092510ccf88e7aa469aae9ce6 (diff) | |
| download | nextcloud-server-e8c1f75064ae008e50daa087924de5d29368747e.tar.gz nextcloud-server-e8c1f75064ae008e50daa087924de5d29368747e.zip | |
Fixing psalm errors
Encryption constructor is problematic and should still be fixed later.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| -rw-r--r-- | core/register_command.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Encryption.php | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/core/register_command.php b/core/register_command.php index 5a708510568..6d7831edc0e 100644 --- a/core/register_command.php +++ b/core/register_command.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())); diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index a03dd0ba441..4cfe932cc9f 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -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']; |