Skip to content

Commit 2c7c469

Browse files
ayacooayacoo
authored
Merge pull request #41 from ayacoo/php85-support
[TASK] Add PHP 8.5 support
2 parents 67f6cde + 3b33958 commit 2c7c469

3 files changed

Lines changed: 24 additions & 10 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
- "8.2"
3636
- "8.3"
3737
- "8.4"
38+
- "8.5"
3839
code-quality:
3940
name: "Code quality checks"
4041
runs-on: ubuntu-22.04
@@ -73,6 +74,7 @@ jobs:
7374
- "8.2"
7475
- "8.3"
7576
- "8.4"
77+
- "8.5"
7678
unit-tests:
7779
name: "Unit tests"
7880
runs-on: ubuntu-22.04
@@ -122,6 +124,9 @@ jobs:
122124
- typo3-version: "^13.4"
123125
php-version: "8.4"
124126
composer-dependencies: highest
127+
- typo3-version: "^13.4"
128+
php-version: "8.5"
129+
composer-dependencies: highest
125130
functional-tests:
126131
name: "Functional tests"
127132
runs-on: ubuntu-22.04
@@ -131,7 +136,7 @@ jobs:
131136
# rest matrix jobs be executed anyway.
132137
fail-fast: false
133138
matrix:
134-
php: [ '8.2', '8.3', '8.4' ]
139+
php: [ '8.2', '8.3', '8.4', '8.5' ]
135140
composerInstall: [ 'composerInstallHighest' ]
136141
steps:
137142
- name: Checkout
@@ -146,14 +151,17 @@ jobs:
146151
- name: Functional Tests with mariadb (max)
147152
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -i 10.11 -s functional
148153

149-
- name: Functional Tests with mysql (min/max)
154+
- name: Functional Tests with mysql (min)
150155
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -i 8.0 -s functional
151156

157+
- name: Functional Tests with mysql (max)
158+
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -i 8.4 -s functional
159+
152160
- name: Functional Tests with postgres (min)
153161
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -i 10 -s functional
154162

155163
- name: Functional Tests with postgres (max)
156-
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -i 16 -s functional
164+
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -i 18 -s functional
157165

158166
- name: Functional Tests with sqlite
159167
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d sqlite -s functional

‎Build/Scripts/runTests.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ handleDbmsOptions() {
4646
exit 1
4747
fi
4848
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10.2"
49-
if ! [[ ${DBMS_VERSION} =~ ^(10.2|10.3|10.4|10.5|10.6|10.7|10.8|10.9|10.10|10.11|11.0|11.1)$ ]]; then
49+
if ! [[ ${DBMS_VERSION} =~ ^(10.2|10.3|10.4|10.5|10.6|10.7|10.8|10.9|10.10|10.11|11.0|11.1|11.4|11.8)$ ]]; then
5050
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
5151
echo >&2
5252
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
@@ -62,7 +62,7 @@ handleDbmsOptions() {
6262
exit 1
6363
fi
6464
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="5.5"
65-
if ! [[ ${DBMS_VERSION} =~ ^(5.5|5.6|5.7|8.0)$ ]]; then
65+
if ! [[ ${DBMS_VERSION} =~ ^(5.5|5.6|5.7|8.0|8.4)$ ]]; then
6666
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
6767
echo >&2
6868
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
@@ -77,7 +77,7 @@ handleDbmsOptions() {
7777
exit 1
7878
fi
7979
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10"
80-
if ! [[ ${DBMS_VERSION} =~ ^(10|11|12|13|14|15|16)$ ]]; then
80+
if ! [[ ${DBMS_VERSION} =~ ^(10|11|12|13|14|15|16|17|18)$ ]]; then
8181
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
8282
echo >&2
8383
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
@@ -212,19 +212,24 @@ Options:
212212
- 10.11 long-term, maintained until 2028-02
213213
- 11.0 development series
214214
- 11.1 short-term development series
215+
- 11.4 long-term, maintained until 2033-01
216+
- 11.8 long-term, maintained until 2033-10
215217
With "-d mysql":
216218
- 5.5 unmaintained since 2018-12 (default)
217219
- 5.6 unmaintained since 2021-02
218220
- 5.7 maintained until 2023-10
219221
- 8.0 maintained until 2026-04
222+
- 8.4 long-term, maintained until 2032-30
220223
With "-d postgres":
221224
- 10 unmaintained since 2022-11-10 (default)
222225
- 11 unmaintained since 2023-11-09
223226
- 12 maintained until 2024-11-14
224227
- 13 maintained until 2025-11-13
225228
- 14 maintained until 2026-11-12
226229
- 15 maintained until 2027-11-11
227-
- 16 maintained until 2028-11-09
230+
- 16 maintained until 2028-11-09 (default)
231+
- 17 maintained until 2029-11-08
232+
- 18 maintained until 2029-11-14
228233
229234
-t <11|12|13>
230235
Only with -s composerInstall|composerInstallMin|composerInstallMax
@@ -233,14 +238,15 @@ Options:
233238
- 12.4: use TYPO3 v12
234239
- 13.4: use TYPO3 v13
235240
236-
-p <7.4|8.0|8.1|8.2|8.3|8.4>
241+
-p <7.4|8.0|8.1|8.2|8.3|8.4|8.5>
237242
Specifies the PHP minor version to be used
238243
- 7.4: use PHP 7.4 (default)
239244
- 8.0: use PHP 8.0
240245
- 8.1: use PHP 8.1
241246
- 8.2: use PHP 8.2
242247
- 8.3: use PHP 8.3
243248
- 8.4: use PHP 8.4
249+
- 8.5: use PHP 8.5
244250
245251
-e "<phpunit options>"
246252
Only with -s docsGenerate|functional|unit
@@ -363,7 +369,7 @@ while getopts "a:b:s:d:i:p:e:t:xy:nhu" OPT; do
363369
;;
364370
p)
365371
PHP_VERSION=${OPTARG}
366-
if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4)$ ]]; then
372+
if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4|8.5)$ ]]; then
367373
INVALID_OPTIONS+=("-p ${OPTARG}")
368374
fi
369375
;;

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"homepage": "https://www.ayacoo.de/",
1313
"license": "GPL-2.0-or-later",
1414
"require": {
15-
"php": ">=8.2 < 8.5",
15+
"php": ">=8.2 < 8.6",
1616
"typo3/cms-core": "^13.4",
1717
"typo3/cms-redirects": "^13.4"
1818
},

0 commit comments

Comments
 (0)