chore: psalm fixes

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Dec 12, 2024 · 5a0bbb3 · 5a0bbb3
1 parent 4d0e5a1
commit 5a0bbb3
Show file tree

Hide file tree

Showing 4 changed files with 709 additions and 106 deletions.
diff --git a/lib/Mount/GroupFolderStorage.php b/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) {

diff --git a/lib/Mount/MountProvider.php b/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;
 

diff --git a/lib/Trash/TrashBackend.php b/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;
@@ -309,9 +310,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 +325,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 +358,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 +425,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));