Skip to content

[stable27] Resolve dependency hell #1304

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

Merged
ChristophWurst merged 3 commits into from
Sep 8, 2023
Merged

[stable27] Resolve dependency hell #1304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0a4814
chore(deps): Move cs-fixer into bin plugin
ChristophWurst Sep 8, 2023
f26633f
chore(deps): Use phar version of Psalm
ChristophWurst Sep 8, 2023
88cbf7c
ci: Use Github hosted runner for OCI
ChristophWurst Sep 8, 2023
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
Next Next commit
chore(deps): Move cs-fixer into bin plugin 
Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst
ChristophWurst committed Sep 8, 2023
commit b0a48145142c1ab29557440a58d19e692a9c2bf5
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ nbproject
/tests/js/run.sh
/tests/karma-coverage
/vendor
/vendor-bin/*/vendor
/.php-cs-fixer.cache

# Vue.js
Expand Down
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

require_once './vendor/autoload.php';
require_once './vendor-bin/cs-fixer/vendor/autoload.php';

use Nextcloud\CodingStandard\Config;

Expand Down
23 changes: 20 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"platform": {
"php": "8.0"
},
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
"autoload-dev": {
"psr-4": {
Expand All @@ -24,12 +27,26 @@
"psalm:update-baseline": "psalm --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml"
"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml",
"post-install-cmd": [
"@composer bin all install --ansi"
],
"post-update-cmd": [
"@composer bin all update --ansi"
]
},
"require-dev": {
"nextcloud/coding-standard": "^1.0.0",
"nextcloud/ocp": "dev-master",
"phpunit/phpunit": "^9.5",
"vimeo/psalm": "^5.1"
},
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": false
}
},
"require": {
"bamarni/composer-bin-plugin": "^1.8"
}
}
Loading