Skip to content

Commit 6bae60e

Browse files
committed
[TASK] Enable PHP 8.5 tests
1 parent be9ac5a commit 6bae60e

3 files changed

Lines changed: 6 additions & 11 deletions

File tree

.github/workflows/core13.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# rest matrix jobs be executed anyway.
1212
fail-fast: true
1313
matrix:
14-
php: [ '8.2', '8.3', '8.4' ]
14+
php: [ '8.2', '8.3', '8.4', '8.5']
1515
composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
1616
steps:
1717
- name: Checkout

.github/workflows/core14.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# rest matrix jobs be executed anyway.
1212
fail-fast: true
1313
matrix:
14-
php: [ '8.2', '8.3', '8.4' ]
14+
php: [ '8.2', '8.3', '8.4', '8.5' ]
1515
composerInstall: [ 'composerInstallLowest', 'composerInstallHighest' ]
1616
steps:
1717
- name: Checkout

Build/Scripts/runTests.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,12 @@ Options:
229229
- 13: use TYPO3 v13
230230
- 14: use TYPO3 v14
231231
232-
-p <8.2|8.3|8.4>
232+
-p <8.2|8.3|8.4|8.5>
233233
Specifies the PHP minor version to be used
234-
- 8.0: use PHP 8.0 (default)
235-
- 8.1: use PHP 8.1
236234
- 8.2: use PHP 8.2
237235
- 8.3: use PHP 8.3
238236
- 8.4: use PHP 8.4
237+
- 8.5: use PHP 8.5
239238
240239
-e "<phpunit options>"
241240
Only with -s docsGenerate|functional|unit
@@ -358,7 +357,7 @@ while getopts "a:b:s:d:i:p:e:t:xy:nhu" OPT; do
358357
;;
359358
p)
360359
PHP_VERSION=${OPTARG}
361-
if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3|8.4)$ ]]; then
360+
if ! [[ ${PHP_VERSION} =~ ^(8.2|8.3|8.4|8.5)$ ]]; then
362361
INVALID_OPTIONS+=("-p ${OPTARG}")
363362
fi
364363
;;
@@ -532,13 +531,9 @@ case ${TEST_SUITE} in
532531
cleanComposer
533532
stashComposerFiles
534533
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-lowest-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/bash -c "
535-
if [ ${TYPO3_VERSION} -eq 12 ]; then
536-
composer require --no-ansi --no-interaction --no-progress --no-install \
537-
typo3/cms-core:^12.4.28 || exit 1
538-
fi
539534
if [ ${TYPO3_VERSION} -eq 13 ]; then
540535
composer require --no-ansi --no-interaction --no-progress --no-install \
541-
typo3/cms-core:^13.4.17 || exit 1
536+
typo3/cms-core:^13.4.20 || exit 1
542537
fi
543538
if [ ${TYPO3_VERSION} -eq 14 ]; then
544539
composer config minimum-stability dev

0 commit comments

Comments
 (0)