From 351d1b3e488c9f493b7dbcbd2d948244d2553893 Mon Sep 17 00:00:00 2001 From: Achim Fritz Date: Tue, 25 Nov 2025 11:30:31 +0100 Subject: [PATCH 1/2] [TASK] disable TYPO3 v11 from CI v11 will no longer installable in CI because packages are affected by security advisories --- .github/workflows/ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb0fedb5..8ac1cc26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,15 +13,9 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - php: [ '7.4', '8.0', '8.1' ] - TYPO3: [ '11' ] + php: [ '8.1', '8.2', '8.3'] + TYPO3: [ '12' ] include: - - TYPO3: '12' - php: '8.1' - - TYPO3: '12' - php: '8.2' - - TYPO3: '12' - php: '8.3' - TYPO3: '13' php: '8.2' - TYPO3: '13' @@ -58,7 +52,7 @@ jobs: - name: Acceptance Tests run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast - if: matrix.TYPO3 != '11' && matrix.TYPO3 != '14' + if: matrix.TYPO3 != '14' - name: Archive acceptance tests results uses: actions/upload-artifact@v4 From 8b2c216eda2564f2fb895e9c4711408d7c273133 Mon Sep 17 00:00:00 2001 From: Achim Fritz Date: Tue, 25 Nov 2025 17:24:33 +0100 Subject: [PATCH 2/2] [TASK] use ^14.0 instead of 14.0.x-dev --- Build/Scripts/runTests.sh | 6 +++--- composer.json | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index c8fa9c48..681a18d1 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -156,7 +156,7 @@ Options: - 11: Use TYPO3 v11.5 - 12 (default): Use TYPO3 v12.4 - 13: Use TYPO3 v13.x - - 14: Use TYPO3 14.0.x-dev + - 14: Use TYPO3 v14.x -a Only with -s functional|functionalDeprecated @@ -603,7 +603,7 @@ case ${TEST_SUITE} in composer require typo3/cms-core:^13.4 typo3/testing-framework:^8.2 phpunit/phpunit:^10.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction composer prepare-tests elif [ ${TYPO3} -eq 14 ]; then - composer require typo3/cms-core:14.0.x-dev --dev -W --no-progress --no-interaction + composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction composer prepare-tests else 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 @@ -625,7 +625,7 @@ case ${TEST_SUITE} in composer require typo3/cms-core:^11.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction composer prepare-tests elif [ ${TYPO3} -eq 14 ]; then - composer require typo3/cms-core:14.0.x-dev --dev -W --no-progress --no-interaction + composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction composer prepare-tests elif [ ${TYPO3} -eq 13 ]; then composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction diff --git a/composer.json b/composer.json index ee845937..1871333e 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "homepage": "https://b13.com", "license": ["GPL-2.0-or-later"], "require": { - "typo3/cms-backend": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev" + "typo3/cms-backend": "^11.5 || ^12.4 || ^13.4 || ^14.0" }, "autoload": { "psr-4": { @@ -30,10 +30,10 @@ }, "require-dev": { "b13/container-example": "dev-master", - "typo3/cms-install": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev", - "typo3/cms-fluid-styled-content": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev", - "typo3/cms-info": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev", - "typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4 || 14.0.x-dev", + "typo3/cms-install": "^11.5 || ^12.4 || ^13.4 || ^14.0", + "typo3/cms-fluid-styled-content": "^11.5 || ^12.4 || ^13.4 || ^14.0", + "typo3/cms-info": "^11.5 || ^12.4 || ^13.4 || ^14.0", + "typo3/cms-workspaces": "^11.5 || ^12.4 || ^13.4 || ^14.0", "typo3/testing-framework": "^7.1.1 || ^8.2.7 || ^9.1", "phpstan/phpstan": "^1.10", "typo3/coding-standards": "^0.5.5",