fix: fix psalm issues

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/Service/GoogleDriveAPIService.php

@@ -542,7 +542,7 @@ private function createDirsUnder(array &$directoriesById, Folder $currentFolder,
 			// create dir if we are on top OR if its parent is current dir
 			if (($currentFolderId === '' && !array_key_exists($parentId, $directoriesById))
 				|| $parentId === $currentFolderId) {
-				$name = $this->fileUtils->sanitizeFilename((string)($dir['name']), $id);
+				$name = $this->fileUtils->sanitizeFilename((string)($dir['name']), (string)$id);
 				if (!$currentFolder->nodeExists($name)) {
 					$newDir = $currentFolder->newFolder($name);
 				} else {
@@ -552,7 +552,7 @@ private function createDirsUnder(array &$directoriesById, Folder $currentFolder,
 					}
 				}
 				$directoriesById[$id]['node'] = $newDir;
-				$success = $this->createDirsUnder($directoriesById, $newDir, $id);
+				$success = $this->createDirsUnder($directoriesById, $newDir, (string)$id);
 				if (!$success) {
 					return false;
 				}
@@ -625,7 +625,7 @@ private function downloadAndSaveFile(
 	 * @return string name of the file to be saved
 	 */
 	private function getFileName(array $fileItem, string $userId, bool $hasNameConflict): string {
-		$fileName = $this->fileUtils->sanitizeFilename((string)($fileItem['name']), $fileItem['id']);
+		$fileName = $this->fileUtils->sanitizeFilename((string)($fileItem['name']), (string)$fileItem['id']);
 
 		if (in_array($fileItem['mimeType'], array_values(self::DOCUMENT_MIME_TYPES))) {
 			$documentFormat = $this->getUserDocumentFormat($userId);

lib/Service/GooglePhotosAPIService.php

@@ -279,7 +279,7 @@ public function importPhotos(
 		$seenIds = [];
 		foreach ($albums as $album) {
 			$albumId = $album['id'];
-			$albumName = $this->fileUtils->sanitizeFilename((string)($album['title']), $album['id']);
+			$albumName = $this->fileUtils->sanitizeFilename((string)($album['title']), (string)$album['id']);
 			if (!$folder->nodeExists($albumName)) {
 				$albumFolder = $folder->newFolder($albumName);
 			} else {
@@ -374,7 +374,7 @@ public function importPhotos(
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	private function getPhoto(string $userId, array $photo, Folder $albumFolder): ?int {
-		$photoName = $this->fileUtils->sanitizeFilename((string)($photo['filename']), $photo['id']);
+		$photoName = $this->fileUtils->sanitizeFilename($photo['filename'], (string)$photo['id']);
 		if ($albumFolder->nodeExists($photoName)) {
 			$photoName = $photo['id'] . '_' . $photoName;
 		}

lib/Service/Utils/FileUtils.php

@@ -11,7 +11,7 @@
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
 
-class FileUtils {
+final class FileUtils {
 
 	public function __construct(
 		private \OCP\Files\IFilenameValidator $validator,
@@ -46,10 +46,10 @@ public function sanitizeFilename(
 		}
 
 		// Use Nextcloud 32+ validator if available
-		if (version_compare($this->config->getSystemValue('version', '0.0.0'), '32.0.0', '>=')) {
+		if (version_compare($this->config->getSystemValueString('version', '0.0.0'), '32.0.0', '>=')) {
 			$this->logger->debug('Using Nextcloud 32+ filename validator for sanitization.');
 			try {
-				return $this->validator->sanitizeFilename($filename);
+				return (string) $this->validator->sanitizeFilename($filename);
 			} catch (\InvalidArgumentException|NotFoundExceptionInterface|ContainerExceptionInterface $exception) {
 				$this->logger->error('Unable to sanitize filename: ' . $filename, ['exception' => $exception]);
 				return 'Untitled_' . $id;
@@ -80,7 +80,7 @@ public function sanitizeFilename(
 			return $filename;
 		} catch (\Throwable $exception) {
 			$this->logger->warning('Exception during filename validation: ' . $filename, ['exception' => $exception]);
-			$filename = self::handleFilenameException($filename, $id, $exception, $logger);
+			$filename = self::handleFilenameException($filename, $id, $exception, $this->logger);
 			if (strpos($filename, $id) === false) {
 				$filename = self::appendIdBeforeExtension($filename, $id);
 			}