Merge pull request #4607 from nextcloud/backport/4479/stable31

[stable31] chore(deps-dev): Bump psalm/phar from 5.26.1 to 6.5.1

Author: juliusknorr

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-stable31",

composer.lock

@@ -556,7 +556,7 @@ public function putFile(string $fileId, string $access_token): JSONResponse {
 					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;

lib/Controller/WopiController.php

@@ -473,7 +473,10 @@ public function getEmptyFileContent(string $extension): string {
 		$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 '';

lib/TemplateManager.php

@@ -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\*" />

psalm.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
+<files psalm-version="6.5.1@3f17a6b24a2dbe543e21408c2b19108cf6a355ef">
   <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>