Skip to content

Commit 44e4fbf

Browse files
committed
chore: Avoid pulling in conflicting dependencies
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent f3a69ff commit 44e4fbf

2 files changed

Lines changed: 1066 additions & 3162 deletions

File tree

composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
],
1818
"require-dev": {
1919
"nextcloud/coding-standard": "^v1.0.0",
20-
"vimeo/psalm": "^5.6.0",
2120
"nextcloud/ocp": "dev-master",
22-
"phan/phan": "5.x",
2321
"staabm/annotate-pull-request-from-checkstyle": "^1.8",
2422
"phpunit/phpunit": "^9",
25-
"nextcloud/openapi-extractor": "dev-main"
23+
"nextcloud/openapi-extractor": "dev-main",
24+
"psalm/phar": "^5.18"
2625
},
2726
"config": {
2827
"optimize-autoloader": true,
@@ -39,10 +38,10 @@
3938
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
4039
"cs:check": "php-cs-fixer fix --dry-run --diff",
4140
"cs:fix": "php-cs-fixer fix",
42-
"psalm": "./vendor/bin/psalm --show-info=true --no-cache",
43-
"psalm:update-baseline": "./vendor/bin/psalm --update-baseline",
44-
"psalm:fix": "./vendor/bin/psalm --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
45-
"psalm:fix:dry": "./vendor/bin/psalm --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType --dry-run"
41+
"psalm": "./vendor/bin/psalm.phar --show-info=true --no-cache",
42+
"psalm:update-baseline": "./vendor/bin/psalm.phar --update-baseline",
43+
"psalm:fix": "./vendor/bin/psalm.phar --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
44+
"psalm:fix:dry": "./vendor/bin/psalm.phar --no-cache --alter --issues=InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType --dry-run"
4645
},
4746
"require": {
4847
"phpoffice/phpspreadsheet": "^1.28",

0 commit comments

Comments
 (0)