diff --git a/composer.json b/composer.json
index 8ca7a14fc..3d10063d0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 	"require-dev": {
 		"roave/security-advisories": "dev-master",
 		"jakub-onderka/php-parallel-lint": "^1.0.0",
-		"psalm/phar": "^5.3",
+		"psalm/phar": "^6.5",
 		"friendsofphp/php-cs-fixer": "^3.8",
 		"nextcloud/coding-standard": "^1.0",
 		"nextcloud/ocp": "dev-master",
diff --git a/composer.lock b/composer.lock
index 58a8c6410..4ebd7eb46 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8d223939222cf02033e9f429d7a6b0dc",
+    "content-hash": "f5ab855f0d7a7bc016da2ba0adb12f27",
     "packages": [
         {
             "name": "mikehaertl/php-pdftk",
@@ -1176,16 +1176,16 @@
         },
         {
             "name": "psalm/phar",
-            "version": "5.26.1",
+            "version": "6.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/psalm/phar.git",
-                "reference": "8a38e7ad04499a0ccd2c506fd1da6fc01fff4547"
+                "reference": "f7ecaf8740f32d58695cee5ac11663e02b44b223"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/psalm/phar/zipball/8a38e7ad04499a0ccd2c506fd1da6fc01fff4547",
-                "reference": "8a38e7ad04499a0ccd2c506fd1da6fc01fff4547",
+                "url": "https://api.github.com/repos/psalm/phar/zipball/f7ecaf8740f32d58695cee5ac11663e02b44b223",
+                "reference": "f7ecaf8740f32d58695cee5ac11663e02b44b223",
                 "shasum": ""
             },
             "require": {
@@ -1205,9 +1205,9 @@
             "description": "Composer-based Psalm Phar",
             "support": {
                 "issues": "https://github.com/psalm/phar/issues",
-                "source": "https://github.com/psalm/phar/tree/5.26.1"
+                "source": "https://github.com/psalm/phar/tree/6.5.1"
             },
-            "time": "2024-09-09T16:22:43+00:00"
+            "time": "2025-02-10T10:05:10+00:00"
         },
         {
             "name": "psr/clock",
@@ -3251,8 +3251,8 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "nextcloud/ocp": 20,
-        "roave/security-advisories": 20
+        "roave/security-advisories": 20,
+        "nextcloud/ocp": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
@@ -3260,9 +3260,9 @@
         "ext-json": "*",
         "ext-simplexml": "*"
     },
-    "platform-dev": {},
+    "platform-dev": [],
     "platform-overrides": {
         "php": "8.1"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 679083bc2..7697e71db 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -555,7 +555,7 @@ class WopiController extends Controller {
 					return new JSONResponse([], Http::STATUS_NOT_FOUND);
 				}
 				$suggested = $this->request->getHeader('X-WOPI-SuggestedTarget');
-				$suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7');
+				$suggested = (string)mb_convert_encoding($suggested, 'utf-8', 'utf-7');
 
 				if ($suggested[0] === '.') {
 					$path = dirname($file->getPath()) . '/New File' . $suggested;
diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php
index 2281bb9a9..fdc2b0613 100644
--- a/lib/TemplateManager.php
+++ b/lib/TemplateManager.php
@@ -473,7 +473,10 @@ class TemplateManager {
 		$emptyPath = __DIR__ . '/../emptyTemplates/template.' . $extension;
 
 		if (in_array($extension, $supportedExtensions, true) && file_exists($emptyPath)) {
-			return file_get_contents($emptyPath);
+			$emptyFileContent = file_get_contents($emptyPath);
+			if ($emptyFileContent !== false) {
+				return $emptyFileContent;
+			}
 		}
 
 		return '';
diff --git a/psalm.xml b/psalm.xml
index c5cf6213f..03cf83de4 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -4,13 +4,15 @@
  - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <psalm
+		errorBaseline="tests/psalm-baseline.xml"
 		errorLevel="4"
+		findUnusedBaselineEntry="true"
+		findUnusedCode="false"
+		phpVersion="8.1"
 		resolveFromConfigFile="true"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="https://getpsalm.org/schema/config"
 		xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-		errorBaseline="tests/psalm-baseline.xml"
-		phpVersion="8.1"
 	>
 	<stubs>
 		<file name="tests/stub.phpstub" preloadClasses="true"/>
@@ -34,13 +36,6 @@
 				<referencedMethod name="/Db\\.*::.*/" />
 			</errorLevel>
 		</UndefinedMagicMethod>
-		<UndefinedInterfaceMethod>
-			<errorLevel type="suppress">
-				<!-- FIXME Deprecated event handling -->
-				<referencedMethod name="OCP\IUserManager::listen" />
-				<referencedMethod name="OCP\IGroupManager::listen" />
-			</errorLevel>
-		</UndefinedInterfaceMethod>
 		<UndefinedClass>
 			<errorLevel type="suppress">
 				<referencedClass name="OC\*" />
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 81a432d72..09c0c27f3 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="lib/AppConfig.php">
     <InvalidArgument>
       <code><![CDATA[[]]]></code>
@@ -28,11 +28,6 @@
       <code><![CDATA[Command]]></code>
     </UndefinedClass>
   </file>
-  <file src="lib/Controller/DirectViewController.php">
-    <InvalidScalarArgument>
-      <code><![CDATA[$item->getId()]]></code>
-    </InvalidScalarArgument>
-  </file>
   <file src="lib/Controller/DocumentAPIController.php">
     <UndefinedClass>
       <code><![CDATA[\OCA\Files\Helper]]></code>
@@ -67,9 +62,6 @@
     <NullArgument>
       <code><![CDATA[null]]></code>
     </NullArgument>
-    <TypeDoesNotContainType>
-      <code><![CDATA[$path === '']]></code>
-    </TypeDoesNotContainType>
     <UndefinedInterfaceMethod>
       <code><![CDATA[putContent]]></code>
       <code><![CDATA[putContent]]></code>
@@ -108,18 +100,6 @@
       <code><![CDATA[getToken]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="lib/Template/CollaboraTemplateProvider.php">
-    <InvalidReturnStatement>
-      <code><![CDATA[array_map(function (File $file) {
-			$template = new Template(CollaboraTemplateProvider::class, (string)$file->getId(), $file);
-			$template->setCustomPreviewUrl($this->urlGenerator->linkToRouteAbsolute('richdocuments.templates.getPreview', ['fileId' => $file->getId()]));
-			return $template;
-		}, $collaboraTemplates)]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code><![CDATA[array]]></code>
-    </InvalidReturnType>
-  </file>
   <file src="lib/WOPI/Parser.php">
     <RedundantCondition>
       <code><![CDATA[$result && count($result) > 0]]></code>