Merge pull request #357 from nextcloud/enh/noid/vimeo-psalm

Switch from psalm/phar to vimeo/psalm to support php 8.5

Author: CarlSchwan

.gitignore

@@ -7,7 +7,7 @@
 .vscode-upload.json
 .*.sw*
 node_modules
-vendor
+vendor/
 js/*hot-update.*
 build
 .php-cs-fixer.cache

REUSE.toml

@@ -10,7 +10,7 @@ SPDX-FileCopyrightText = "2021-2024 Nextcloud translators"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = [".tx/config", "composer.json", "composer.lock", "package-lock.json", "package.json"]
+path = [".tx/config", "composer.json", "composer.lock", "package-lock.json", "package.json", "vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2021 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

composer.json

@@ -5,20 +5,34 @@
 		"classmap-authoritative": true,
 		"platform": {
 			"php": "8.2"
+		},
+		"allow-plugins": {
+			"bamarni/composer-bin-plugin": true
 		}
 	},
 	"scripts": {
 		"cs:fix": "php-cs-fixer fix",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
 		"test:unit": "phpunit -c tests/phpunit.xml --fail-on-warning",
-		"psalm": "psalm.phar --no-cache"
+		"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": {
 		"christophwurst/nextcloud_testing": "^1.0.1",
 		"nextcloud/coding-standard": "^1.3.2",
 		"phpunit/phpunit": "^9",
-		"psalm/phar": "^6",
 		"nextcloud/ocp": "dev-master"
+	},
+	"require": {
+		"bamarni/composer-bin-plugin": "^1.8"
+	},
+	"extra": {
+		"bamarni-bin": {
+			"bin-links": true,
+			"target-directory": "vendor-bin",
+			"forward-command": true
+		}
 	}
 }

composer.lock

@@ -0,0 +1,13 @@
+{
+	"require": {
+		"php": "^8.2 || ^8.3 || ^8.4 || ^8.5"
+	},
+	"require-dev": {
+		"vimeo/psalm": "^6.10.0"
+	},
+	"config": {
+		"platform": {
+			"php": "8.2.27"
+		}
+	}
+}