Skip to content

Commit 761c2ae

Browse files
authored
Merge branch 'stable-7' into dependabot/github_actions/stable-7/softprops/action-gh-release-3
2 parents a20f7b1 + 35c022d commit 761c2ae

7 files changed

Lines changed: 11 additions & 210 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
- name: Checkout repository
3131
uses: actions/checkout@v6.0.1
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@v4
33+
uses: github/codeql-action/init@v4.35.1
3434
with:
3535
languages: ${{ matrix.language }}
3636
- name: Autobuild
37-
uses: github/codeql-action/autobuild@v4
37+
uses: github/codeql-action/autobuild@v4.35.1
3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@v4
39+
uses: github/codeql-action/analyze@v4.35.1

.github/workflows/lint-php-cs.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,10 @@ jobs:
2929
with:
3030
persist-credentials: false
3131

32-
- name: Get php version
33-
id: versions
34-
uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1
35-
36-
- name: Set up php${{ steps.versions.outputs.php-min }}
32+
- name: Set up php 8.1
3733
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
3834
with:
39-
php-version: ${{ steps.versions.outputs.php-min }}
35+
php-version: 8.1
4036
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
4137
coverage: none
4238
ini-file: development

.github/workflows/phpunit-mariadb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
strategy:
7070
matrix:
71-
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
71+
php-versions: ['8.1', '8.2', '8.3']
7272
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
7373
mariadb-versions: ['10.6', '11.4']
7474

.github/workflows/phpunit-mysql.yml

Lines changed: 0 additions & 195 deletions
This file was deleted.

.github/workflows/phpunit-pgsql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
strategy:
7070
matrix:
71-
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
71+
php-versions: ['8.1', '8.2', '8.3']
7272
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
7373

7474
name: PostgreSQL PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}

.github/workflows/phpunit-sqlite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
strategy:
7070
matrix:
71-
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
71+
php-versions: ['8.1', '8.2', '8.3']
7272
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
7373

7474
name: SQLite PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
"cs:check": "php-cs-fixer fix --dry-run --diff",
4848
"cs:fix": "php-cs-fixer fix",
4949
"psalm": "psalm --no-diff",
50-
"phpunit:unit": "phpunit -c tests/phpunit.xml",
51-
"phpunit:integration": "phpunit -c tests/phpunit.xml",
50+
"test:unit": "phpunit -c tests/phpunit.xml",
51+
"test:integration": "phpunit -c tests/phpunit.xml",
5252
"psalm:fix": "psalm --alter --php-version=8.0 --issues=MissingReturnType,InvalidReturnType,InvalidNullableReturnType,MismatchingDocblockParamType,MismatchingDocblockReturnType,MissingParamType,InvalidFalsableReturnType",
5353
"psalm:info": "psalm --no-diff --show-info=true",
5454
"psalm:baseline": "psalm --set-baseline=psalm-baseline.xml",
@@ -67,4 +67,4 @@
6767
"league/commonmark": "^2.1",
6868
"rlanvin/php-rrule": "^2.3"
6969
}
70-
}
70+
}

0 commit comments

Comments
 (0)