chore: psalm fixes

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

[skip ci]

Author: icewind1991

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;
@@ -299,9 +300,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);
 			}
@@ -312,7 +315,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);
 				}
@@ -345,6 +348,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);
@@ -411,6 +415,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($trashFolder->getPath());

tests/stub.phpstub

@@ -279,6 +279,9 @@ namespace OCA\Files_Trashbin {
 		 */
 		public function isExpired($timestamp, $quotaExceeded = false) {}
 	}
+
+	class Storage extends \OC\Files\Storage\Wrapper\Wrapper {
+	}
 }
 
 
@@ -1500,7 +1503,7 @@ namespace OC\Files\Storage\Wrapper{
 		* @param string $targetInternalPath
 		* @return bool
 		*/
-		public function copyFromStorage(\OCP\Files\Storage\IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath)
+		public function copyFromStorage(\OCP\Files\Storage\IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false)
 		{
 		}
 		/**
@@ -1572,6 +1575,8 @@ namespace OC\Files\Storage\Wrapper{
 	class PermissionsMask extends Wrapper {
 		public function getQuota() {}
 	}
+	class Encryption extends \OC\Files\Storage\Wrapper\Wrapper {
+	}
 }
 
 namespace OC\Files\ObjectStore {
@@ -1667,3 +1672,7 @@ namespace OCA\DAV\Connector\Sabre\Exception {
 		public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {}
 	}
 }
+
+namespace OC\Encryption\Exceptions {
+	class DecryptionFailedException extends \Exception {}
+}