Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ jobs:

- name: Set up PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: composer i
# remove psalm because it requires php >= 8.2 and we want to test with 8.1
run: |
composer uninstall --dev psalm/phar
composer i

- name: Set up Nextcloud
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ jobs:
coverage: none

- name: Install dependencies
run: composer i
# remove psalm because it requires php >= 8.2 and we want to test with 8.0
run: |
composer uninstall --dev psalm/phar phpunit/phpunit
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
26 changes: 5 additions & 21 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,32 +21,13 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.0', '8.1', '8.2']
php-versions: ['8.1', '8.2', '8.3']
databases: ['mysql']
server-versions: ['stable29', 'stable30', 'stable31', 'master']
exclude:
- php-versions: 8.0
server-versions: master
- php-versions: 8.0
server-versions: stable31
- php-versions: 8.0
server-versions: stable30
include:
- php-versions: 8.3
databases: mysql
server-versions: stable29
- php-versions: 8.3
databases: mysql
server-versions: stable30
- php-versions: 8.3
databases: mysql
server-versions: stable31
- php-versions: 8.4
databases: mysql
server-versions: stable31
- php-versions: 8.3
databases: mysql
server-versions: master
- php-versions: 8.4
databases: mysql
server-versions: master
Expand Down Expand Up @@ -100,7 +81,10 @@ jobs:

- name: Set up PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: composer i
# remove psalm because it requires php >= 8.2 and we want to test with 8.1
run: |
composer uninstall --dev psalm/phar
composer i

- name: Set up Nextcloud
run: |
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"require-dev": {
"nextcloud/coding-standard": "^1.0.0",
"symfony/event-dispatcher": "^4",
"phpunit/phpunit": "^9.5",
"nextcloud/ocp": "dev-stable28",
"psalm/phar": "6.7.x"
"psalm/phar": "^6",
"phpunit/phpunit": "^10"
},
"extra": {
"mozart": {
Expand Down
Loading
Loading