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
14 changes: 11 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
code-quality:
name: "Code quality checks"
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -73,6 +74,7 @@ jobs:
- "8.2"
- "8.3"
- "8.4"
- "8.5"
unit-tests:
name: "Unit tests"
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -122,6 +124,9 @@ jobs:
- typo3-version: "^13.4"
php-version: "8.4"
composer-dependencies: highest
- typo3-version: "^13.4"
php-version: "8.5"
composer-dependencies: highest
functional-tests:
name: "Functional tests"
runs-on: ubuntu-22.04
Expand All @@ -131,7 +136,7 @@ jobs:
# rest matrix jobs be executed anyway.
fail-fast: false
matrix:
php: [ '8.2', '8.3', '8.4' ]
php: [ '8.2', '8.3', '8.4', '8.5' ]
composerInstall: [ 'composerInstallHighest' ]
steps:
- name: Checkout
Expand All @@ -146,14 +151,17 @@ jobs:
- name: Functional Tests with mariadb (max)
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mariadb -i 10.11 -s functional

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

- name: Functional Tests with mysql (max)
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d mysql -i 8.4 -s functional

- name: Functional Tests with postgres (min)
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d postgres -i 10 -s functional

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

- name: Functional Tests with sqlite
run: Build/Scripts/runTests.sh -t 13 -p ${{ matrix.php }} -d sqlite -s functional
18 changes: 12 additions & 6 deletions Build/Scripts/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ handleDbmsOptions() {
exit 1
fi
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10.2"
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
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
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
echo >&2
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
Expand All @@ -62,7 +62,7 @@ handleDbmsOptions() {
exit 1
fi
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="5.5"
if ! [[ ${DBMS_VERSION} =~ ^(5.5|5.6|5.7|8.0)$ ]]; then
if ! [[ ${DBMS_VERSION} =~ ^(5.5|5.6|5.7|8.0|8.4)$ ]]; then
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
echo >&2
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
Expand All @@ -77,7 +77,7 @@ handleDbmsOptions() {
exit 1
fi
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="10"
if ! [[ ${DBMS_VERSION} =~ ^(10|11|12|13|14|15|16)$ ]]; then
if ! [[ ${DBMS_VERSION} =~ ^(10|11|12|13|14|15|16|17|18)$ ]]; then
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
echo >&2
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
Expand Down Expand Up @@ -212,19 +212,24 @@ Options:
- 10.11 long-term, maintained until 2028-02
- 11.0 development series
- 11.1 short-term development series
- 11.4 long-term, maintained until 2033-01
- 11.8 long-term, maintained until 2033-10
With "-d mysql":
- 5.5 unmaintained since 2018-12 (default)
- 5.6 unmaintained since 2021-02
- 5.7 maintained until 2023-10
- 8.0 maintained until 2026-04
- 8.4 long-term, maintained until 2032-30
With "-d postgres":
- 10 unmaintained since 2022-11-10 (default)
- 11 unmaintained since 2023-11-09
- 12 maintained until 2024-11-14
- 13 maintained until 2025-11-13
- 14 maintained until 2026-11-12
- 15 maintained until 2027-11-11
- 16 maintained until 2028-11-09
- 16 maintained until 2028-11-09 (default)
- 17 maintained until 2029-11-08
- 18 maintained until 2029-11-14

-t <11|12|13>
Only with -s composerInstall|composerInstallMin|composerInstallMax
Expand All @@ -233,14 +238,15 @@ Options:
- 12.4: use TYPO3 v12
- 13.4: use TYPO3 v13

-p <7.4|8.0|8.1|8.2|8.3|8.4>
-p <7.4|8.0|8.1|8.2|8.3|8.4|8.5>
Specifies the PHP minor version to be used
- 7.4: use PHP 7.4 (default)
- 8.0: use PHP 8.0
- 8.1: use PHP 8.1
- 8.2: use PHP 8.2
- 8.3: use PHP 8.3
- 8.4: use PHP 8.4
- 8.5: use PHP 8.5

-e "<phpunit options>"
Only with -s docsGenerate|functional|unit
Expand Down Expand Up @@ -363,7 +369,7 @@ while getopts "a:b:s:d:i:p:e:t:xy:nhu" OPT; do
;;
p)
PHP_VERSION=${OPTARG}
if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4)$ ]]; then
if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4|8.5)$ ]]; then
INVALID_OPTIONS+=("-p ${OPTARG}")
fi
;;
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"homepage": "https://www.ayacoo.de/",
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.2 < 8.5",
"php": ">=8.2 < 8.6",
"typo3/cms-core": "^13.4",
"typo3/cms-redirects": "^13.4"
},
Expand Down