Fixing psalm errors

Encryption constructor is problematic and should still be fixed later.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/core/register_command.php b/core/register_command.php
index 5a708510568e48eb6ca45a742a5d3a068f61fa63..6d7831edc0eafbfa15499632a6d2abecac834305 100644 (file)
--- 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 a03dd0ba4418180c78303098f90f80fb55dff32d..4cfe932cc9ff74fed98abe01d33d55051e3f4196 100644 (file)
--- 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'];