Skip to content

Commit acab3cb

Browse files
committed
chore: update php dev dependencies (#971)
* chore: update php dev packages Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com> * chore: fix lint errors Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com> * chore: test with php 8.4 Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com> * ci: remove unwanted nextcloud env Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com> * ci: fix postgress db service Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com> * test: accept 500 error on invalid json Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com> --------- Signed-off-by: Saw-jan <saw.jan.grg3e@gmail.com>
1 parent 4232c8a commit acab3cb

7 files changed

Lines changed: 2273 additions & 955 deletions

File tree

.github/workflows/shared_workflow.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
nextcloud_versions:
1111
required: false
1212
type: string
13-
default: "31 32"
13+
default: '31 32'
1414
php_versions:
1515
required: false
1616
type: string
17-
default: "8.1 8.2 8.3"
17+
default: '8.2 8.3 8.4'
1818

1919
name: CI
2020

@@ -66,7 +66,7 @@ jobs:
6666
github-token: ${{ secrets.GITHUB_TOKEN }}
6767
lcov-file: ./coverage/jest/lcov.info
6868
delete-old-comments: true
69-
title: "JS Code Coverage"
69+
title: 'JS Code Coverage'
7070

7171
- name: JS coverage check
7272
if: ${{ github.event_name == 'pull_request' }}
@@ -93,9 +93,9 @@ jobs:
9393
env:
9494
NEXTCLOUD_VERSIONS: ${{ inputs.nextcloud_versions }}
9595
PHP_VERSIONS: ${{ inputs.php_versions }}
96-
DEFAULT_PHP_VERSION: "8.3"
97-
DEFAULT_DATABASE: "mysql"
98-
EXTRA_DATABASES: "pgsql"
96+
DEFAULT_PHP_VERSION: '8.3'
97+
DEFAULT_DATABASE: 'mysql'
98+
EXTRA_DATABASES: 'pgsql'
9999
run: |
100100
MATRIX=$(./.github/scripts/generate-matrix.sh)
101101
echo "matrix={\"include\": [$MATRIX]}" >> $GITHUB_OUTPUT
@@ -116,24 +116,23 @@ jobs:
116116

117117
services:
118118
nextcloud:
119-
image: ghcr.io/juliusknorr/nextcloud-dev-php${{ format('{0}{1}', matrix.phpVersionMajor,matrix.phpVersionMinor) }}:20231202-1
119+
image: ghcr.io/juliusknorr/nextcloud-dev-php${{ format('{0}{1}', matrix.phpVersionMajor,matrix.phpVersionMinor) }}:master
120120
env:
121121
SQL: ${{ matrix.database }}
122122
SERVER_BRANCH: ${{ matrix.nextcloudVersion }}
123-
NEXTCLOUD_AUTOINSTALL: "Yes"
124-
NEXTCLOUD_TRUSTED_DOMAINS: nextcloud
125-
VIRTUAL_HOST: "nextcloud"
126-
WITH_REDIS: "YES"
123+
NEXTCLOUD_AUTOINSTALL: 'Yes'
124+
WITH_REDIS: 'YES'
127125
ports:
128126
- 80:80
129127
options: --name=nextcloud
130128
volumes:
131129
- ${{ github.workspace }}:/var/www/html/apps-shared
132130

133-
database-postgres:
131+
database-pgsql:
134132
image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest
135133
env:
136134
POSTGRES_PASSWORD: postgres
135+
POSTGRES_USER: postgres
137136
POSTGRES_DB: nextcloud
138137

139138
database-mysql:
@@ -291,7 +290,7 @@ jobs:
291290
github-token: ${{ secrets.GITHUB_TOKEN }}
292291
lcov-file: 'integration_openproject/server/apps/integration_openproject/coverage/php/lcov.info'
293292
delete-old-comments: true
294-
title: "PHP Code Coverage"
293+
title: 'PHP Code Coverage'
295294

296295
- name: PHP coverage check
297296
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable32' && matrix.phpVersion == '8.2' }}

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"require-dev": {
3-
"phpunit/phpunit": "^9.5",
3+
"phpunit/phpunit": "^9.6.34",
44
"pact-foundation/pact-php": "^10.1.1",
5-
"friendsofphp/php-cs-fixer": "^3.65.0",
5+
"friendsofphp/php-cs-fixer": "^3.93.1",
66
"nextcloud/coding-standard": "^1.0",
7-
"behat/behat": "^3.10",
8-
"helmich/phpunit-json-assert": "^3.4",
9-
"vimeo/psalm": "5.23.1",
10-
"guzzlehttp/guzzle": "^7.9",
11-
"behat/gherkin": "v4.12.0",
12-
"php-mock/php-mock-phpunit": "^2.10"
7+
"behat/behat": "^3.29.0",
8+
"helmich/phpunit-json-assert": "^3.5.4",
9+
"vimeo/psalm": "^6.15.0",
10+
"guzzlehttp/guzzle": "^7.10.0",
11+
"behat/gherkin": "v4.16.1",
12+
"php-mock/php-mock-phpunit": "^2.14.0"
1313
},
1414
"scripts": {
1515
"cs:fix": "php-cs-fixer fix",

0 commit comments

Comments
 (0)