@@ -142,21 +142,18 @@ Options:
142142 - podman (default)
143143 - docker
144144
145- -p <7.4|8.0|8.1|8. 2|8.3|8.4>
145+ -p <8. 2|8.3|8.4|8.5 >
146146 Specifies the PHP minor version to be used
147- - 7.4: use PHP 7.4
148- - 8.0: use PHP 8.0
149- - 8.1: use PHP 8.1
150147 - 8.2 (default): use PHP 8.2
151148 - 8.3: use PHP 8.3
152149 - 8.4: use PHP 8.4
150+ - 8.5: use PHP 8.5
153151
154- -t <11|12| 13|14>
152+ -t <13|14|14-dev >
155153 Specifies the TYPO3 Core version to be used - Only with -s composerInstall|phpstan|acceptance
156- - 11: Use TYPO3 v11.5
157- - 12 (default): Use TYPO3 v12.4
158154 - 13: Use TYPO3 v13.x
159155 - 14: Use TYPO3 v14.x
156+ - 14-dev Use TYPO3 14.2.x-dev
160157
161158 -a <mysqli|pdo_mysql>
162159 Only with -s functional|functionalDeprecated
@@ -338,16 +335,17 @@ while getopts "a:b:s:d:i:t:p:xy:o:nhug" OPT; do
338335 ;;
339336 t)
340337 TYPO3=${OPTARG}
341- if ! [[ ${TYPO3} =~ ^(11 | 12 | 13| 14)$ ]]; then
338+ if ! [[ ${TYPO3} =~ ^(13| 14| 14-dev )$ ]]; then
342339 INVALID_OPTIONS+=(" ${OPTARG} " )
343340 fi
344341 # @todo Remove USE_APACHE option when TF7 has been dropped (along with TYPO3 v11 support).
345342 [[ " ${TYPO3} " -eq 13 ]] && USE_APACHE=1
346343 [[ " ${TYPO3} " -eq 14 ]] && USE_APACHE=1
344+ [[ " ${TYPO3} " -eq " 14-dev" ]] && USE_APACHE=1
347345 ;;
348346 p)
349347 PHP_VERSION=${OPTARG}
350- if ! [[ ${PHP_VERSION} =~ ^(7.4 | 8.0 | 8.1 | 8. 2| 8.3| 8.4)$ ]]; then
348+ if ! [[ ${PHP_VERSION} =~ ^(8. 2| 8.3| 8.4| 8.5 )$ ]]; then
351349 INVALID_OPTIONS+=(" ${OPTARG} " )
352350 fi
353351 ;;
@@ -597,18 +595,13 @@ case ${TEST_SUITE} in
597595 fi
598596 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-install-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/sh -c "
599597 php -v | grep '^PHP';
600- if [ ${TYPO3} -eq 11 ]; then
601- composer require typo3/cms-core:^11.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
602- composer prepare-tests
603- elif [ ${TYPO3} -eq 13 ]; then
604- composer require typo3/cms-core:^13.4 typo3/testing-framework:^9 phpunit/phpunit:^11 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
605- composer prepare-tests
598+
599+ if [ " ${TYPO3} " == " 14-dev" ]; then
600+ composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
606601 elif [ ${TYPO3} -eq 14 ]; then
607- composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction
608- composer prepare-tests
602+ composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
609603 else
610- composer require typo3/cms-core:^12.4 typo3/testing-framework:^8.2 phpunit/phpunit:^10.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
611- composer prepare-tests
604+ composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
612605 fi
613606 "
614607 SUITE_EXIT_CODE=$?
@@ -622,18 +615,12 @@ case ${TEST_SUITE} in
622615 fi
623616 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-validate-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/sh -c "
624617 php -v | grep '^PHP';
625- if [ ${TYPO3} -eq 11 ]; then
626- composer require typo3/cms-core:^11.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
627- composer prepare-tests
618+ if [ " ${TYPO3} " == " 14-dev" ]; then
619+ composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
628620 elif [ ${TYPO3} -eq 14 ]; then
629- composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction
630- composer prepare-tests
631- elif [ ${TYPO3} -eq 13 ]; then
632- composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
633- composer prepare-tests
621+ composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
634622 else
635- composer require typo3/cms-core:^12.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
636- composer prepare-tests
623+ composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
637624 fi
638625 composer validate
639626 "
@@ -688,10 +675,10 @@ case ${TEST_SUITE} in
688675 SUITE_EXIT_CODE=$?
689676 ;;
690677 phpstan)
691- if [ ${PHP_VERSION } == " 7.4 " ]; then
692- COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan ${TYPO3} -7.4 .neon --no-progress --no-interaction --memory-limit 4G " $@ " )
678+ if [ ${TYPO3 } == 13 ]; then
679+ COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan13 .neon --no-progress --no-interaction --memory-limit 4G " $@ " )
693680 else
694- COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan ${TYPO3} .neon --no-progress --no-interaction --memory-limit 4G " $@ " )
681+ COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan14 .neon --no-progress --no-interaction --memory-limit 4G " $@ " )
695682 fi
696683 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name phpstan-${SUFFIX} ${IMAGE_PHP} " ${COMMAND[@]} "
697684 SUITE_EXIT_CODE=$?
0 commit comments