Merge pull request #14286 from nextcloud/ci/noid/psalm6

nickvergessen · web-flow · commit e67e50a43fc0 · 2025-02-06T14:37:47.000+01:00
ci: Update psalm to v6
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -14,34 +14,49 @@ concurrency:
   group: psalm-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   static-analysis:
     runs-on: ubuntu-latest
 
     name: static-psalm-analysis
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
 
       - name: Get php version
         id: versions
         uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
 
+      - name: Check enforcement of minimum PHP version ${{ steps.versions.outputs.php-min }} in psalm.xml
+        run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
+
       - name: Set up php${{ steps.versions.outputs.php-available }}
         uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1
         with:
           php-version: ${{ steps.versions.outputs.php-available }}
           extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
           coverage: none
           ini-file: development
+          # Temporary workaround for missing pcntl_* in PHP 8.3
+          ini-values: disable_functions=
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
-        run: composer i
+        run: |
+          composer remove nextcloud/ocp --dev
+          composer i
 
       - name: Check for vulnerable PHP dependencies
         run: composer require --dev roave/security-advisories:dev-latest
 
+      - name: Install nextcloud/ocp
+        run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies
+
       - name: Run coding standards check
-        run: composer run psalm
+        run: composer run psalm -- --threads=1 --monochrome --no-progress --output-format=github
diff --git a/composer.json b/composer.json
@@ -23,17 +23,16 @@
 		"openapi": "generate-spec --verbose && (npm run typescript:generate || echo 'Please manually regenerate the typescript OpenAPI models')",
 		"rector:check": "rector --dry-run",
 		"rector:fix": "rector",
-		"psalm": "psalm --threads=1",
-		"psalm:dev": "psalm --no-cache --threads=$(nproc)",
+		"psalm": "psalm --no-cache --threads=$(nproc)",
+		"psalm:dev": "@psalm",
 		"psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
-		"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
-		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
 		"post-install-cmd": [
 			"@composer bin all install --ansi",
 			"\"vendor/bin/mozart\" compose",
 			"composer dump-autoload"
 		],
 		"post-update-cmd": [
+			"@composer bin all install --ansi",
 			"\"vendor/bin/mozart\" compose",
 			"composer dump-autoload"
 		],
diff --git a/lib/Controller/RecordingController.php b/lib/Controller/RecordingController.php
@@ -157,7 +157,7 @@ private function validateBackendRequest(string $data): bool {
 	 * @return string
 	 */
 	protected function getInputStream(): string {
-		return file_get_contents('php://input');
+		return (string)file_get_contents('php://input');
 	}
 
 	/**
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
@@ -632,7 +632,7 @@ private function validateBackendRequest(string $data): bool {
 	 * @return string
 	 */
 	protected function getInputStream(): string {
-		return file_get_contents('php://input');
+		return (string)file_get_contents('php://input');
 	}
 
 	/**
diff --git a/psalm.xml b/psalm.xml
@@ -67,21 +67,6 @@
 				<referencedClass name="OCA\FederatedFileSharing\AddressHandler" />
 			</errorLevel>
 		</UndefinedDocblockClass>
-		<UndefinedInterfaceMethod>
-			<errorLevel type="suppress">
-				<referencedMethod name="OCP\IDBConnection::getInner" />
-			</errorLevel>
-		</UndefinedInterfaceMethod>
-		<InvalidThrow>
-			<errorLevel type="suppress">
-				<referencedClass name="Doctrine\DBAL\Exception\UniqueConstraintViolationException" />
-			</errorLevel>
-		</InvalidThrow>
-		<UnimplementedInterfaceMethod>
-			<errorLevel type="suppress">
-				<file name="lib/Chat/CommentsManager.php" />
-			</errorLevel>
-		</UnimplementedInterfaceMethod>
 	</issueHandlers>
 	<stubs>
 		<file name="tests/stubs/oc_comments_comment.php" />
diff --git 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.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
+<files psalm-version="6.2.0@814dfde37b43a1fe6d9b0996e08b19661af53bc5">
   <file src="lib/AppInfo/Application.php">
     <UndefinedClass>
       <code><![CDATA[BeforeTemplateRenderedEvent]]></code>
@@ -44,6 +44,26 @@
       <code><![CDATA[$return['num_rooms']]]></code>
     </InvalidArrayAccess>
   </file>
+  <file src="lib/Model/Poll.php">
+    <LessSpecificReturnStatement>
+      <code><![CDATA[[
+			'id' => $this->getId(),
+			// The room id is not needed on the API level but only internally for optimising database queries
+			// 'roomId' => $this->getRoomId(),
+			'question' => $this->getQuestion(),
+			'options' => json_decode($this->getOptions(), true, 512, JSON_THROW_ON_ERROR),
+			'actorType' => $this->getActorType(),
+			'actorId' => $this->getActorId(),
+			'actorDisplayName' => $this->getDisplayName(),
+			'status' => $this->getStatus(),
+			'resultMode' => $this->getResultMode(),
+			'maxVotes' => $this->getMaxVotes(),
+		]]]></code>
+    </LessSpecificReturnStatement>
+    <MoreSpecificReturnType>
+      <code><![CDATA[TalkPollDraft]]></code>
+    </MoreSpecificReturnType>
+  </file>
   <file src="lib/Notification/Notifier.php">
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[$this->participants]]></code>
@@ -69,6 +89,30 @@
       <code><![CDATA[Filesystem]]></code>
     </UndefinedClass>
   </file>
+  <file src="lib/Service/BotService.php">
+    <InvalidArgument>
+      <code><![CDATA[[
+			'type' => 'Activity',
+			'actor' => [
+				'type' => 'Person',
+				'id' => $message->getActorType() . '/' . $message->getActorId(),
+				'name' => $message->getActorDisplayName(),
+			],
+			'object' => [
+				'type' => 'Note',
+				'id' => $event->getComment()->getId(),
+				'name' => $message->getMessageRaw(),
+				'content' => json_encode($messageData),
+				'mediaType' => 'text/markdown',
+			],
+			'target' => [
+				'type' => 'Collection',
+				'id' => $event->getRoom()->getToken(),
+				'name' => $event->getRoom()->getName(),
+			]
+		]]]></code>
+    </InvalidArgument>
+  </file>
   <file src="lib/Service/RecordingService.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[$recordingFolder]]></code>
diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json
@@ -1,11 +1,11 @@
 {
 	"config": {
 		"platform": {
-			"php": "8.1"
+			"php": "8.1.17"
 		},
 		"sort-packages": true
 	},
 	"require-dev": {
-		"vimeo/psalm": "^5.26.0"
+		"vimeo/psalm": "^6.2.0"
 	}
 }
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ private function validateBackendRequest(string $data): bool {`
`157`	`157`	`* @return string`
`158`	`158`	`*/`
`159`	`159`	`protected function getInputStream(): string {`
`160`		`- return file_get_contents('php://input');`
	`160`	`+ return (string)file_get_contents('php://input');`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ private function validateBackendRequest(string $data): bool {`
`632`	`632`	`* @return string`
`633`	`633`	`*/`
`634`	`634`	`protected function getInputStream(): string {`
`635`		`- return file_get_contents('php://input');`
	`635`	`+ return (string)file_get_contents('php://input');`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"config": {`
`3`	`3`	`"platform": {`
`4`		`- "php": "8.1"`
	`4`	`+ "php": "8.1.17"`
`5`	`5`	`},`
`6`	`6`	`"sort-packages": true`
`7`	`7`	`},`
`8`	`8`	`"require-dev": {`
`9`		`- "vimeo/psalm": "^5.26.0"`
	`9`	`+ "vimeo/psalm": "^6.2.0"`
`10`	`10`	`}`
`11`	`11`	`}`