Skip to content

Commit 8af0bc3

Browse files
achimfritzachimfritz
committed
[TASK] adapt composer and ci requirements
1 parent bb36573 commit 8af0bc3

File tree

3 files changed

+37
-53
lines changed

3 files changed

+37
-53
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,8 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
strategy:
1515
matrix:
16-
php: [ '8.1', '8.2', '8.3']
17-
TYPO3: [ '12' ]
18-
include:
19-
- TYPO3: '13'
20-
php: '8.2'
21-
- TYPO3: '13'
22-
php: '8.3'
23-
- TYPO3: '14'
24-
php: '8.2'
25-
- TYPO3: '14'
26-
php: '8.3'
16+
php: [ '8.2', '8.3', '8.4', '8.5']
17+
TYPO3: [ '13', '14', '14-dev' ]
2718
steps:
2819
- name: Checkout
2920
uses: actions/checkout@v4
@@ -48,18 +39,18 @@ jobs:
4839

4940
- name: Functional Tests
5041
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional
51-
if: matrix.TYPO3 != '14'
42+
if: matrix.TYPO3 == '13'
5243

5344
- name: Functional Tests 14
5445
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional -- --exclude-group content_defender
55-
if: matrix.TYPO3 == '14'
46+
if: matrix.TYPO3 != '13'
5647

5748
- name: Acceptance Tests
5849
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast
59-
if: matrix.TYPO3 != '14'
50+
if: matrix.TYPO3 == '13'
6051
- name: Acceptance Tests 14
6152
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast --skip-group=content_defender
62-
if: matrix.TYPO3 == '14'
53+
if: matrix.TYPO3 != '13'
6354
- name: Archive acceptance tests results
6455
uses: actions/upload-artifact@v4
6556
if: always()

‎Build/Scripts/runTests.sh‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -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,17 +595,15 @@ 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
598+
599+
if [ "${TYPO3}" == "14-dev" ]; then
600+
composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
605601
composer prepare-tests
606602
elif [ ${TYPO3} -eq 14 ]; then
607-
composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction
603+
composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
608604
composer prepare-tests
609605
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
606+
composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
611607
composer prepare-tests
612608
fi
613609
"
@@ -622,17 +618,14 @@ case ${TEST_SUITE} in
622618
fi
623619
${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 "
624620
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
621+
if [ "${TYPO3}" == "14-dev" ]; then
622+
composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
627623
composer prepare-tests
628624
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
625+
composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
633626
composer prepare-tests
634627
else
635-
composer require typo3/cms-core:^12.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
628+
composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
636629
composer prepare-tests
637630
fi
638631
composer validate
@@ -688,10 +681,10 @@ case ${TEST_SUITE} in
688681
SUITE_EXIT_CODE=$?
689682
;;
690683
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 "$@")
684+
if [ ${TYPO3} == 13 ]; then
685+
COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan13.neon --no-progress --no-interaction --memory-limit 4G "$@")
693686
else
694-
COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan${TYPO3}.neon --no-progress --no-interaction --memory-limit 4G "$@")
687+
COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan14.neon --no-progress --no-interaction --memory-limit 4G "$@")
695688
fi
696689
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name phpstan-${SUFFIX} ${IMAGE_PHP} "${COMMAND[@]}"
697690
SUITE_EXIT_CODE=$?

‎composer.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"homepage": "https://b13.com",
66
"license": ["GPL-2.0-or-later"],
77
"require": {
8-
"typo3/cms-backend": "^11.5 || ^12.4 || ^13.4 || ^14.0"
8+
"typo3/cms-backend": "^13.4 || ^14.1 || 14.2.x-dev"
99
},
1010
"autoload": {
1111
"psr-4": {
@@ -29,20 +29,20 @@
2929
}
3030
},
3131
"require-dev": {
32-
"b13/container-example": "dev-task/v14-backend-template",
33-
"typo3/cms-install": "^11.5 || ^12.4 || ^13.4 || ^14.0",
34-
"typo3/cms-fluid-styled-content": "^11.5 || ^12.4 || ^13.4 || ^14.0",
35-
"typo3/cms-info": "^11.5 || ^12.4 || ^13.4 || ^14.0",
36-
"typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4 || ^14.0",
37-
"typo3/testing-framework": "^7.1.1 || ^8.2.7 || ^9.1",
32+
"b13/container-example": "dev-master",
33+
"typo3/cms-install": "^13.4 || ^14.1 || || 14.2.x-dev",
34+
"typo3/cms-fluid-styled-content": "^^13.4 || ^14.1 || || 14.2.x-dev",
35+
"typo3/cms-info": "^13.4 || ^14.1 || || 14.2.x-dev",
36+
"typo3/cms-workspaces": "^13.4 || ^14.1 || || 14.2.x-dev",
37+
"typo3/testing-framework": "^9.1",
3838
"phpstan/phpstan": "^1.10",
3939
"typo3/coding-standards": "^0.5.5",
4040
"friendsofphp/php-cs-fixer": "^3.51",
41-
"codeception/codeception": "^4.1 || ^5.1",
42-
"codeception/module-asserts": "^1.0 || ^3.0",
43-
"codeception/module-webdriver": "^1.0 || ^4.0",
44-
"codeception/module-db": "^1.0 || ^3.1",
45-
"phpunit/phpunit": "9.6 || ^10.5 || ^11.3"
41+
"codeception/codeception": "^5.1",
42+
"codeception/module-asserts": "^3.0",
43+
"codeception/module-webdriver": "^4.0",
44+
"codeception/module-db": "^3.1",
45+
"phpunit/phpunit": "^11.3"
4646
},
4747
"replace": {
4848
"typo3-ter/container": "self.version"

0 commit comments

Comments
 (0)