Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
julien-nc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.vscode-upload.json
.*.sw*
node_modules
vendor
vendor/
js/*hot-update.*
build
.php-cs-fixer.cache
Expand Down
2 changes: 1 addition & 1 deletion REUSE.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 16 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
97 changes: 60 additions & 37 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions vendor-bin/psalm/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
Loading
Loading