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
23 changes: 7 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,8 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
php: [ '8.1', '8.2', '8.3']
TYPO3: [ '12' ]
include:
- TYPO3: '13'
php: '8.2'
- TYPO3: '13'
php: '8.3'
- TYPO3: '14'
php: '8.2'
- TYPO3: '14'
php: '8.3'
php: [ '8.2', '8.3', '8.4', '8.5']
TYPO3: [ '13', '14', '14-dev' ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -47,19 +38,19 @@ jobs:
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s unit

- name: Functional Tests
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional
if: matrix.TYPO3 != '14'
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s functional -- --do-not-fail-on-deprecation
if: matrix.TYPO3 == '13'

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

- name: Acceptance Tests
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast
if: matrix.TYPO3 != '14'
if: matrix.TYPO3 == '13'
- name: Acceptance Tests 14
run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -t ${{ matrix.TYPO3 }} -s acceptance -- --fail-fast --skip-group=content_defender
if: matrix.TYPO3 == '14'
if: matrix.TYPO3 != '13'
- name: Archive acceptance tests results
uses: actions/upload-artifact@v4
if: always()
Expand Down
14 changes: 0 additions & 14 deletions Build/JavaScript/README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@

build v12

git clone https://github.com/typo3/typo3.git
git checkout 12.4
cp EXT:container/Build/JavaScript/js-12.patch .
patch -p1 < js-12.patch
cd Build
nvm use v22.2.0
npm ci
node_modules/grunt/bin/grunt scripts
cp JavaScript/backend/layout-module/* EXT:container/Resources/Public/JavaScript/Overrides12/

build v13

git clone https://github.com/typo3/typo3.git
Expand All @@ -24,10 +12,8 @@ build v13
cp JavaScript/backend/layout-module/* EXT:container/Resources/Public/JavaScript/Overrides/



build patch file

git format-patch 12.4 --stdout > js-12.patch
git format-patch 13.4 --stdout > js-13.patch

build with docker
Expand Down
149 changes: 0 additions & 149 deletions Build/JavaScript/js-12.patch

This file was deleted.

47 changes: 0 additions & 47 deletions Build/LocalConfiguration.php

This file was deleted.

51 changes: 19 additions & 32 deletions Build/Scripts/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,18 @@ Options:
- podman (default)
- docker

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

-t <11|12|13|14>
-t <13|14|14-dev>
Specifies the TYPO3 Core version to be used - Only with -s composerInstall|phpstan|acceptance
- 11: Use TYPO3 v11.5
- 12 (default): Use TYPO3 v12.4
- 13: Use TYPO3 v13.x
- 14: Use TYPO3 v14.x
- 14-dev Use TYPO3 14.2.x-dev

-a <mysqli|pdo_mysql>
Only with -s functional|functionalDeprecated
Expand Down Expand Up @@ -338,16 +335,17 @@ while getopts "a:b:s:d:i:t:p:xy:o:nhug" OPT; do
;;
t)
TYPO3=${OPTARG}
if ! [[ ${TYPO3} =~ ^(11|12|13|14)$ ]]; then
if ! [[ ${TYPO3} =~ ^(13|14|14-dev)$ ]]; then
INVALID_OPTIONS+=("${OPTARG}")
fi
# @todo Remove USE_APACHE option when TF7 has been dropped (along with TYPO3 v11 support).
[[ "${TYPO3}" -eq 13 ]] && USE_APACHE=1
[[ "${TYPO3}" -eq 14 ]] && USE_APACHE=1
[[ "${TYPO3}" -eq "14-dev" ]] && USE_APACHE=1
;;
p)
PHP_VERSION=${OPTARG}
if ! [[ ${PHP_VERSION} =~ ^(7.4|8.0|8.1|8.2|8.3|8.4)$ ]]; then
if ! [[ ${PHP_VERSION} =~ ^(8.2|8.3|8.4|8.5)$ ]]; then
INVALID_OPTIONS+=("${OPTARG}")
fi
;;
Expand Down Expand Up @@ -597,18 +595,13 @@ case ${TEST_SUITE} in
fi
${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 "
php -v | grep '^PHP';
if [ ${TYPO3} -eq 11 ]; then
composer require typo3/cms-core:^11.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
composer prepare-tests
elif [ ${TYPO3} -eq 13 ]; then
composer require typo3/cms-core:^13.4 typo3/testing-framework:^9 phpunit/phpunit:^11 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
composer prepare-tests

if [ "${TYPO3}" == "14-dev" ]; then
composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
elif [ ${TYPO3} -eq 14 ]; then
composer require typo3/cms-core:^14.0 --dev -W --no-progress --no-interaction
composer prepare-tests
composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
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
composer prepare-tests
composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
fi
"
SUITE_EXIT_CODE=$?
Expand All @@ -622,18 +615,12 @@ case ${TEST_SUITE} in
fi
${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 "
php -v | grep '^PHP';
if [ ${TYPO3} -eq 11 ]; then
composer require typo3/cms-core:^11.5 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
composer prepare-tests
if [ "${TYPO3}" == "14-dev" ]; then
composer require typo3/cms-core:14.2.x-dev --dev -W --no-progress --no-interaction
elif [ ${TYPO3} -eq 14 ]; then
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
composer prepare-tests
composer require typo3/cms-core:^14.1 --dev -W --no-progress --no-interaction
else
composer require typo3/cms-core:^12.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
composer prepare-tests
composer require typo3/cms-core:^13.4 ichhabrecht/content-defender --dev -W --no-progress --no-interaction
fi
composer validate
"
Expand Down Expand Up @@ -688,10 +675,10 @@ case ${TEST_SUITE} in
SUITE_EXIT_CODE=$?
;;
phpstan)
if [ ${PHP_VERSION} == "7.4" ]; then
COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan${TYPO3}-7.4.neon --no-progress --no-interaction --memory-limit 4G "$@")
if [ ${TYPO3} == 13 ]; then
COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan13.neon --no-progress --no-interaction --memory-limit 4G "$@")
else
COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan${TYPO3}.neon --no-progress --no-interaction --memory-limit 4G "$@")
COMMAND=(php -dxdebug.mode=off .Build/bin/phpstan analyse -c Build/phpstan14.neon --no-progress --no-interaction --memory-limit 4G "$@")
fi
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name phpstan-${SUFFIX} ${IMAGE_PHP} "${COMMAND[@]}"
SUITE_EXIT_CODE=$?
Expand Down
4 changes: 0 additions & 4 deletions Build/envs/.env.local

This file was deleted.

Loading