Merge pull request #60012 from nextcloud/chore/rector-psalm

chore: fix strict psalm and rector

Author: susnux

apps/dav/lib/Connector/Sabre/Node.php

@@ -28,6 +28,7 @@
 use OCP\PreConditionNotMetException;
 use OCP\Server;
 use OCP\Share\Exceptions\ShareNotFound;
+use OCP\Share\IAttributes;
 use OCP\Share\IManager;
 use RuntimeException;
 use Sabre\DAV\Exception;
@@ -297,7 +298,7 @@ public function getShareAttributes(): array {
 		$attributes = [];
 		if ($storage->instanceOfStorage(ISharedStorage::class)) {
 			$attributes = $storage->getShare()->getAttributes();
-			if ($attributes === null) {
+			if (!$attributes instanceof IAttributes) {
 				return [];
 			}
 

build/rector-strict.php

@@ -25,6 +25,10 @@
 		$nextcloudDir . '/lib/private/DB/QueryBuilder/TypedQueryBuilder.php',
 		$nextcloudDir . '/lib/public/DB/QueryBuilder/ITypedQueryBuilder.php',
 	])
+	->withAutoloadPaths([
+		// ensure rector properly autoload the public interfaces
+		$nextcloudDir . '/lib/public',
+	])
 	->withPreparedSets(
 		deadCode: true,
 		codeQuality: true,

psalm-strict.xml

@@ -15,6 +15,9 @@
 	findUnusedVariablesAndParams="true"
 	phpVersion="8.2"
 >
+	<plugins>
+		<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+	</plugins>
 	<projectFiles>
 		<file name="core/BackgroundJobs/ExpirePreviewsJob.php"/>
 		<file name="lib/public/IContainer.php"/>
@@ -34,7 +37,6 @@
 		<file name="lib/public/Share/IShareHelper.php"/>
 		<ignoreFiles>
 			<directory name="apps/**/composer"/>
-			<directory name="apps/**/tests"/>
 			<directory name="lib/composer"/>
 			<directory name="lib/l10n"/>
 			<directory name="3rdparty"/>
@@ -43,6 +45,9 @@
 	<extraFiles>
 		<directory name="apps/dav/lib"/>
 		<directory name="apps/settings/lib"/>
+		<!-- As long as the files are not in the projectFiles list, we need to include them here to make psalm aware of our interfaces -->
+		<directory name="lib/private"/>
+		<directory name="lib/public"/>
 		<directory name="3rdparty"/>
 	</extraFiles>
 	<stubs>

psalm.xml

@@ -20,6 +20,7 @@
 		<plugin filename="build/psalm/AppFrameworkTainter.php" />
 		<plugin filename="build/psalm/AttributeNamedParameters.php" />
 		<plugin filename="build/psalm/LogicalOperatorChecker.php" />
+		<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
 	</plugins>
 	<projectFiles>
 		<directory name="apps/admin_audit"/>

vendor-bin/psalm/composer.json

@@ -1,13 +1,14 @@
 {
-	"require": {
-		"vimeo/psalm": "^6.16"
-	},
 	"config": {
 		"platform": {
 			"php": "8.2.27"
 		},
 		"allow-plugins": {
 			"composer/package-versions-deprecated": true
 		}
+	},
+	"require": {
+		"psalm/plugin-phpunit": "^0.19.7",
+		"vimeo/psalm": "^6.16"
 	}
 }