fix: use vimeo/psalm and stop hardcoding php 8.2 in psalm action

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

Author: julien-nc

.github/workflows/psalm-matrix.yml

@@ -56,12 +56,10 @@ jobs:
         with:
           persist-credentials: false
 
-      #- name: Set up php${{ matrix.php-versions }}
-      - name: Set up php8.2
+      - name: Set up php${{ matrix.php-versions }}
         uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
         with:
-          #php-version: ${{ matrix.php-versions }}
-          php-version: 8.2
+          php-version: ${{ matrix.php-versions }}
           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

.gitignore

@@ -8,4 +8,4 @@ js/
 .vscode-upload.json
 .*.sw*
 node_modules
-/vendor
+vendor/

REUSE.toml

@@ -18,7 +18,7 @@ SPDX-FileCopyrightText = "2020 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = ["composer.json", "composer.lock"]
+path = ["composer.json", "composer.lock", "vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

composer.json

@@ -1,26 +1,36 @@
 {
 	"require": {
-		"php": ">=8.1"
+		"php": ">=8.1",
+		"bamarni/composer-bin-plugin": "^1.8"
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
-		"psalm": "psalm.phar --no-cache",
-		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
-		"psalm:update-baseline:force": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml"
+		"psalm": "psalm --no-cache",
+		"psalm:update-baseline": "psalm --threads=1 --update-baseline",
+		"psalm:update-baseline:force": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml"
 	},
 	"require-dev": {
 		"friendsofphp/php-cs-fixer": "^3",
 		"nextcloud/coding-standard": "^1",
-		"psalm/phar": "6.7.x",
 		"nextcloud/ocp": "dev-master",
 		"guzzlehttp/guzzle": "^7.5.1",
 		"sabre/dav": "^4.4.0"
 	},
 	"config": {
 		"platform": {
 			"php": "8.1"
+		},
+		"allow-plugins": {
+			"bamarni/composer-bin-plugin": true
+		}
+	},
+	"extra": {
+		"bamarni-bin": {
+			"bin-links": true,
+			"target-directory": "vendor-bin",
+			"forward-command": true
 		}
 	}
 }