Merge pull request #881 from nextcloud/backport/879/stable31

[stable31] Upgrade psalm to version 6

Author: come-nc

.github/dependabot.yml

@@ -3,7 +3,11 @@
 version: 2
 updates:
 - package-ecosystem: composer
-  directory: "/"
+  directories:
+  - /
+  - /vendor-bin/cs-fixer
+  - /vendor-bin/phpunit
+  - /vendor-bin/psalm
   schedule:
     interval: weekly
     day: saturday

.gitignore

@@ -2,9 +2,10 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 .idea
 *.iml
-/vendor/
+vendor/
 /build/
 node_modules/
 /.php_cs.cache
 js/*hot-update.*
 /.php-cs-fixer.cache
+.phpunit.result.cache

.nextcloudignore

@@ -14,6 +14,7 @@
 /package.json
 /src/
 /tests
+/vendor-bin
 /node_modules
 /phpunit.xml
 /phpunit.integration.xml

REUSE.toml

@@ -12,13 +12,13 @@ SPDX-FileCopyrightText = "2022-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", "tests/psalm-baseline.xml"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2022 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
 [[annotations]]
-path = ["vendor-bin/cs-fixer/composer.json", "vendor-bin/cs-fixer/composer.lock", "vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock"]
+path = ["vendor-bin/cs-fixer/composer.json", "vendor-bin/cs-fixer/composer.lock", "vendor-bin/phpunit/composer.json", "vendor-bin/phpunit/composer.lock", "vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 Nextcloud GmbH and Nextcloud contributors"
 SPDX-License-Identifier = "AGPL-3.0-or-later"

composer.json

@@ -32,8 +32,6 @@
 		}
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^9.5",
-		"vimeo/psalm": "^5.6",
 		"doctrine/dbal": "^3",
 		"deepdiver/zipstreamer": "^2.0",
 		"nextcloud/ocp": "dev-stable31",