Skip to content

Commit 2c2c869

Browse files
skjnldsvskjnldsv
authored
Merge pull request #1381 from nextcloud/fix/psalm-min-php-version
fix(ci): unblock CI — enforce PHP 8.3 in psalm.xml + sync PHP workflow templates
2 parents 0977978 + 0adfb9b commit 2c2c869

8 files changed

Lines changed: 29 additions & 25 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

@@ -34,7 +34,7 @@ jobs:
3434
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
3535

3636
- name: Set up php${{ steps.versions.outputs.php-min }}
37-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
37+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
3838
with:
3939
php-version: ${{ steps.versions.outputs.php-min }}
4040
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
php-max: ${{ steps.versions.outputs.php-max }}
2626
steps:
2727
- name: Checkout app
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

@@ -34,7 +34,7 @@ jobs:
3434
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2
3535

3636
php-lint:
37-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-latest-low
3838
needs: matrix
3939
strategy:
4040
matrix:
@@ -44,12 +44,12 @@ jobs:
4444

4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
47+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4848
with:
4949
persist-credentials: false
5050

5151
- name: Set up php ${{ matrix.php-versions }}
52-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
52+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
5353
with:
5454
php-version: ${{ matrix.php-versions }}
5555
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎.github/workflows/phpunit-mysql.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix: ${{ steps.versions.outputs.sparse-matrix }}
2525
steps:
2626
- name: Checkout app
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2828
with:
2929
persist-credentials: false
3030

@@ -68,6 +68,7 @@ jobs:
6868
if: needs.changes.outputs.src != 'false'
6969

7070
strategy:
71+
fail-fast: false
7172
matrix: ${{ fromJson(needs.matrix.outputs.matrix) }}
7273

7374
name: MySQL ${{ matrix.mysql-versions }} PHP ${{ matrix.php-versions }} Nextcloud ${{ matrix.server-versions }}
@@ -89,21 +90,21 @@ jobs:
8990
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9091
9192
- name: Checkout server
92-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
93+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9394
with:
9495
persist-credentials: false
9596
submodules: true
9697
repository: nextcloud/server
9798
ref: ${{ matrix.server-versions }}
9899

99100
- name: Checkout app
100-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
101+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
101102
with:
102103
persist-credentials: false
103104
path: apps/${{ env.APP_NAME }}
104105

105106
- name: Set up php ${{ matrix.php-versions }}
106-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
107+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
107108
with:
108109
php-version: ${{ matrix.php-versions }}
109110
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

‎.github/workflows/phpunit-oci.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
server-max: ${{ steps.versions.outputs.branches-max-list }}
2626
steps:
2727
- name: Checkout app
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

@@ -67,6 +67,7 @@ jobs:
6767
if: needs.changes.outputs.src != 'false'
6868

6969
strategy:
70+
fail-fast: false
7071
matrix:
7172
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
7273
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
@@ -101,21 +102,21 @@ jobs:
101102
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
102103
103104
- name: Checkout server
104-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
105+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
105106
with:
106107
persist-credentials: false
107108
submodules: true
108109
repository: nextcloud/server
109110
ref: ${{ matrix.server-versions }}
110111

111112
- name: Checkout app
112-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
113+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
113114
with:
114115
persist-credentials: false
115116
path: apps/${{ env.APP_NAME }}
116117

117118
- name: Set up php ${{ matrix.php-versions }}
118-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
119+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
119120
with:
120121
php-version: ${{ matrix.php-versions }}
121122
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

‎.github/workflows/phpunit-pgsql.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
server-max: ${{ steps.versions.outputs.branches-max-list }}
2626
steps:
2727
- name: Checkout app
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

@@ -67,6 +67,7 @@ jobs:
6767
if: needs.changes.outputs.src != 'false'
6868

6969
strategy:
70+
fail-fast: false
7071
matrix:
7172
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
7273
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
@@ -92,21 +93,21 @@ jobs:
9293
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
9394
9495
- name: Checkout server
95-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
96+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9697
with:
9798
persist-credentials: false
9899
submodules: true
99100
repository: nextcloud/server
100101
ref: ${{ matrix.server-versions }}
101102

102103
- name: Checkout app
103-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
104+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
104105
with:
105106
persist-credentials: false
106107
path: apps/${{ env.APP_NAME }}
107108

108109
- name: Set up php ${{ matrix.php-versions }}
109-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
110+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
110111
with:
111112
php-version: ${{ matrix.php-versions }}
112113
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

‎.github/workflows/phpunit-sqlite.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
server-max: ${{ steps.versions.outputs.branches-max-list }}
2626
steps:
2727
- name: Checkout app
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

@@ -67,6 +67,7 @@ jobs:
6767
if: needs.changes.outputs.src != 'false'
6868

6969
strategy:
70+
fail-fast: false
7071
matrix:
7172
php-versions: ${{ fromJson(needs.matrix.outputs.php-version) }}
7273
server-versions: ${{ fromJson(needs.matrix.outputs.server-max) }}
@@ -81,21 +82,21 @@ jobs:
8182
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
8283
8384
- name: Checkout server
84-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
85+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8586
with:
8687
persist-credentials: false
8788
submodules: true
8889
repository: nextcloud/server
8990
ref: ${{ matrix.server-versions }}
9091

9192
- name: Checkout app
92-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
93+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9394
with:
9495
persist-credentials: false
9596
path: apps/${{ env.APP_NAME }}
9697

9798
- name: Set up php ${{ matrix.php-versions }}
98-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
99+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
99100
with:
100101
php-version: ${{ matrix.php-versions }}
101102
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

‎.github/workflows/psalm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: static-psalm-analysis
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2828
with:
2929
persist-credentials: false
3030

@@ -36,7 +36,7 @@ jobs:
3636
run: grep 'phpVersion="${{ steps.versions.outputs.php-min }}' psalm.xml
3737

3838
- name: Set up php${{ steps.versions.outputs.php-available }}
39-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
39+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
4040
with:
4141
php-version: ${{ steps.versions.outputs.php-available }}
4242
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎psalm.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
findUnusedBaselineEntry="true"
1010
findUnusedCode="false"
1111
resolveFromConfigFile="true"
12-
phpVersion="8.2"
12+
phpVersion="8.3"
1313
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1414
xmlns="https://getpsalm.org/schema/config"
1515
xsi:schemaLocation="https://getpsalm.org/schema/config vendor-bin/psalm/vendor/vimeo/psalm/config.xsd"

0 commit comments

Comments
 (0)