bump psalm to v6.1.0, fix psalm issues

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
julien-nc · Feb 2, 2025 · 862fe02 · 862fe02
1 parent c09bc5e
commit 862fe02
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 45 deletions.
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -38,7 +38,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: ['30', '31', 'dev-master']
+        ocp-version: ['30', 'dev-stable31', 'dev-master']
         php-version: ['8.1', '8.2', '8.3', '8.4']
 
 

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
 	},
 	"require-dev": {
 		"nextcloud/coding-standard": "^1.1",
-		"psalm/phar": "^5.16",
+		"psalm/phar": "^6.1.0",
 		"nextcloud/ocp": "dev-master",
 		"phpunit/phpunit": "^9.5"
 	}

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Service/KmlConversionService.php b/lib/Service/KmlConversionService.php
@@ -524,6 +524,9 @@ public function exportDirToKmz(string $userId, Directory $dir): string {
 		$zip->addFromString('doc.kml', $kmlDoc->saveXML());
 		$zip->close();
 		$zipContent = file_get_contents($tempFile);
+		if ($zipContent === false) {
+			throw new Exception('Impossible to read the zip file');
+		}
 
 		return $zipContent;
 	}

diff --git a/lib/Service/ToolsService.php b/lib/Service/ToolsService.php
@@ -128,8 +128,11 @@ public function utcdate() {
 
 	public function remove_utf8_bom(string $text): string {
 		$bom = pack('H*', 'EFBBBF');
-		$text = preg_replace("/^$bom/", '', $text);
-		return $text;
+		$cleanText = preg_replace("/^$bom/", '', $text);
+		if ($cleanText === null) {
+			return $text;
+		}
+		return $cleanText;
 	}
 
 	public function encodeURIComponent(string $str): string {

diff --git a/psalm.xml b/psalm.xml
@@ -47,12 +47,12 @@
 				<referencedClass name="Doctrine\DBAL\Types\Type" />
 			</errorLevel>
 		</UndefinedDocblockClass>
-		<InvalidClass>
+		<!--InvalidClass>
 			<errorLevel type="suppress">
 				<referencedClass name="OCP\Db\Exception" />
 				<referencedClass name="OCP\AppFramework\Db\QBMapper" />
 			</errorLevel>
-		</InvalidClass>
+		</InvalidClass-->
 	</issueHandlers>
 	<stubs>
 		<file name="tests/stubs/oc_core_command_base.php" />