chore: psalm fixes

Signed-off-by: Robin Appelman <[email protected]>

Author: icewind1991

lib/AppInfo/Application.php

@@ -142,7 +142,8 @@ public function register(IRegistrationContext $context): void {
 				$c->get(MountProvider::class),
 				$c->get(ACLManagerFactory::class),
 				$c->get(IRootFolder::class),
-				$c->get(LoggerInterface::class)
+				$c->get(LoggerInterface::class),
+				$c->get(IUserSession::class),
 			);
 			$hasVersionApp = interface_exists(\OCA\Files_Versions\Versions\IVersionBackend::class);
 			if ($hasVersionApp) {

lib/Mount/GroupFolderStorage.php

@@ -25,6 +25,7 @@
 use OC\Files\ObjectStore\ObjectStoreScanner;
 use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\Storage\Wrapper\Quota;
+use OCP\Files\Cache\ICache;
 use OCP\Files\Cache\ICacheEntry;
 use OCP\IUser;
 use OCP\IUserSession;
@@ -33,8 +34,8 @@ class GroupFolderStorage extends Quota {
 	private int $folderId;
 	private ?ICacheEntry $rootEntry;
 	private IUserSession $userSession;
-	private ?IUser $mountOwner = null;
-	/** @var RootEntryCache|null */
+	private ?IUser $mountOwner;
+	/** @var ICache|null */
 	public $cache = null;
 
 	public function __construct($parameters) {

lib/Mount/MountProvider.php

@@ -279,7 +279,7 @@ public function getTrashMount(
 
 		$storage = $this->getRootFolder()->getStorage();
 
-		$storage->setOwner($user?->getUID());
+		$storage->setOwner($user->getUID());
 
 		$trashPath = $this->getRootFolder()->getInternalPath() . '/trash/' . $id;
 

lib/Trash/TrashBackend.php

@@ -22,6 +22,7 @@
 namespace OCA\GroupFolders\Trash;
 
 use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\Storage\Wrapper\Encryption;
 use OC\Files\Storage\Wrapper\Jail;
 use OCA\Files_Trashbin\Expiration;
@@ -41,6 +42,7 @@
 use OCP\Files\NotPermittedException;
 use OCP\Files\Storage\IStorage;
 use OCP\IUser;
+use OCP\IUserSession;
 use Psr\Log\LoggerInterface;
 
 class TrashBackend implements ITrashBackend {
@@ -53,6 +55,7 @@ class TrashBackend implements ITrashBackend {
 	private $versionsBackend = null;
 	private IRootFolder $rootFolder;
 	private LoggerInterface $logger;
+	private IUserSession $userSession;
 
 	public function __construct(
 		FolderManager $folderManager,
@@ -61,7 +64,8 @@ public function __construct(
 		MountProvider $mountProvider,
 		ACLManagerFactory $aclManagerFactory,
 		IRootFolder $rootFolder,
-		LoggerInterface $logger
+		LoggerInterface $logger,
+		IUserSession $userSession,
 	) {
 		$this->folderManager = $folderManager;
 		$this->trashManager = $trashManager;
@@ -70,6 +74,7 @@ public function __construct(
 		$this->aclManagerFactory = $aclManagerFactory;
 		$this->rootFolder = $rootFolder;
 		$this->logger = $logger;
+		$this->userSession = $userSession;
 	}
 
 	public function setVersionsBackend(VersionsBackend $versionsBackend): void {
@@ -309,9 +314,11 @@ private function moveFromEncryptedStorage(IStorage $sourceStorage, IStorage $tar
 			$sourceStorage = $sourceStorage->getWrapperStorage();
 		}
 
+		/** @psalm-suppress TooManyArguments */
 		$result = $targetStorage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath, true);
 		if ($result) {
-			if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
+			// hacky workaround to make sure we don't rely on a newer minor version
+			if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class) && is_callable([$sourceStorage, 'setPreserveCacheOnDelete'])) {
 				/** @var ObjectStoreStorage $sourceStorage */
 				$sourceStorage->setPreserveCacheOnDelete(true);
 			}
@@ -322,7 +329,7 @@ private function moveFromEncryptedStorage(IStorage $sourceStorage, IStorage $tar
 					$result = $sourceStorage->unlink($sourceInternalPath);
 				}
 			} finally {
-				if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
+				if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class) && is_callable([$sourceStorage, 'setPreserveCacheOnDelete'])) {
 					/** @var ObjectStoreStorage $sourceStorage */
 					$sourceStorage->setPreserveCacheOnDelete(false);
 				}
@@ -355,6 +362,7 @@ private function getNodeForTrashItem(IUser $user, ITrashItem $trashItem): ?Node
 		$folders = $this->folderManager->getFoldersForUser($user);
 		foreach ($folders as $groupFolder) {
 			if ($groupFolder['folder_id'] === $folderId) {
+				/** @var Folder $trashRoot */
 				$trashRoot = $this->rootFolder->get('/' . $user->getUID() . '/files_trashbin/groupfolders/' . $folderId);
 				try {
 					$node = $trashRoot->get($path);
@@ -421,6 +429,8 @@ private function getTrashForFolders(IUser $user, array $folders): array {
 			// ensure the trash folder exists
 			$this->getTrashFolder($folderId);
 
+
+			/** @var Folder $trashFolder */
 			$trashFolder = $this->rootFolder->get('/' . $user->getUID() . '/files_trashbin/groupfolders/' . $folderId);
 			$content = $trashFolder->getDirectoryListing();
 			$this->aclManagerFactory->getACLManager($user)->preloadRulesForFolder($this->getUnJailedPath($trashFolder));