psalm fixes

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Apr 4, 2023 · b9ec6ad · b9ec6ad
1 parent 20993af
commit b9ec6ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/apps/encryption/lib/Command/FixKeyLocation.php b/apps/encryption/lib/Command/FixKeyLocation.php
@@ -238,7 +238,7 @@ public function findUserKeyForSystemFileByName(IUser $user, File $node): ?string
 	 *
 	 * @param string $basePath
 	 * @param string $name
-	 * @return \Generator<string>
+	 * @return \Iterator<mixed, string>
 	 */
 	public function findKeysByFileName(string $basePath, string $name) {
 		$allKeys = $this->repair->findAllKeysInDirectory($basePath);

diff --git a/apps/encryption/lib/Repair.php b/apps/encryption/lib/Repair.php
@@ -69,7 +69,9 @@ public function getUserKeyRoot(IUser $user): string {
 	}
 
 	public function tryReadFile(File $node): bool {
-		$this->keyStorage->clearKeyCache();
+		if ($this->keyStorage instanceof Storage) {
+			$this->keyStorage->clearKeyCache();
+		}
 		try {
 			$fh = $node->fopen('r');
 			// read a single chunk
@@ -265,7 +267,7 @@ public function getKeyPath(IUser $user, Node $node): string {
 		if ($this->needsSystemKey($node->getPath())) {
 			return $this->getSystemKeyPath($node);
 		} else {
-			return $this->getUserKeyRoot($user, $node);
+			return $this->getUserKeyRoot($user);
 		}
 	}