Skip to content

Bump php-dependencies #1159

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
skjnldsv merged 2 commits into from
Apr 7, 2022
Merged

Bump php-dependencies #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdaf802
Bump php-dependencies
jotoeri Apr 5, 2022
3b1725b
Scope cs-fixer
jotoeri Apr 6, 2022
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
4 changes: 3 additions & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ jobs:
coverage: none

- name: Install dependencies
run: composer i
# Needs to run twice currently, to install cs-bin-dependency
# https://github.com/bamarni/composer-bin-plugin/issues/72
run: composer i && composer i

- name: Run coding standards check
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
node_modules/
vendor/
/vendor-bin/*/vendor
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down Expand Up @@ -28,8 +29,9 @@ js/
v8-compile-cache-0/

# php-cs cache
.php_cs.cache
.php-cs-fixer.cache

# phpunit results
.phpunit.result.cache
clover.unit.xml
clover.integration.xml
0 .php_cs.dist → .php-cs-fixer.dist.php
View file
Open in desktop
File renamed without changes.
19 changes: 14 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
"config": {
"optimize-autoloader": true,
"classmap-authoritative": true,
"sort-packages": true,
"platform": {
"php": "7.2"
"php": "7.3"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
"scripts": {
Expand All @@ -15,11 +19,16 @@
"test:integration": "phpunit -c tests/phpunit.integration.xml"
},
"require-dev": {
"christophwurst/nextcloud": "^20.0",
"nextcloud/coding-standard": "^0.5.0",
"phpunit/phpunit": "^8"
"bamarni/composer-bin-plugin": "^1.5",
"christophwurst/nextcloud": "^22.0",
"phpunit/phpunit": "^9"
},
"require": {
"league/csv": "^9.5"
"league/csv": "^9.7.3"
},
"extra": {
"bamarni-bin": {
"forward-command": true
}
}
}
Loading