[TASK] Add acceptanceComposer suite to runTests.sh

achimfritz · claude · achimfritz · commit 82d15cf667e9 · 2026-06-23T18:12:33.000+02:00
Ports TYPO3 core commit fa6c3fc4ea3 (Add composer-mode to our
acceptance test matrix) to b13/container, adding the infrastructure
to run backend acceptance tests against a real composer-installed
TYPO3 instance instead of the fixture-based classic-mode instance.

- Add Build/Scripts/setupAcceptanceComposer.sh: creates a fresh
  composer-installed TYPO3 under .Build/Web/typo3temp/var/tests/
  acceptance-composer/, wires b13/container as a path repository,
  runs typo3 setup, and imports all acceptance fixtures via
  dataset:import.
- Add -s acceptanceComposer case to runTests.sh: spins up an optional
  DB container, runs the setup script, then starts chrome + phpfpm +
  apache pointing at the composer instance public/ dir, and invokes
  codecept with --env ci,composer.
- Update printSummary, help text, and -d/-g/-x flag docs accordingly.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
@@ -16,7 +16,7 @@ printSummary() {
     echo "Container runtime: ${CONTAINER_BIN}" >&2
     echo "Container suffix: ${SUFFIX}"
     echo "PHP: ${PHP_VERSION}" >&2
-    if [[ ${TEST_SUITE} =~ ^(functional|acceptance)$ ]]; then
+    if [[ ${TEST_SUITE} =~ ^(functional|acceptance|acceptanceComposer)$ ]]; then
         case "${DBMS}" in
             mariadb|mysql|postgres)
                 echo "DBMS: ${DBMS}  version ${DBMS_VERSION}  driver ${DATABASE_DRIVER}" >&2
@@ -155,7 +155,8 @@ Usage: $0 [options] [file]
 Options:
     -s <...>
         Specifies the test suite to run
-            - acceptance: backend acceptance tests
+            - acceptance: backend acceptance tests (classic mode, fixture-based instance)
+            - acceptanceComposer: backend acceptance tests against a real composer-installed TYPO3 instance
             - cgl: test and fix all core php files
             - composer: "composer" command dispatcher, to execute various composer commands
             - composerInstall: "composer install", handy if host has no PHP, uses composer cache of users home
@@ -194,7 +195,7 @@ Options:
                 - pdo_mysql
 
     -d <sqlite|mariadb|mysql|postgres>
-        Only with -s functional|functionalDeprecated|acceptance|acceptanceInstall
+        Only with -s functional|functionalDeprecated|acceptance|acceptanceComposer|acceptanceInstall
         Specifies on which DBMS tests are performed
             - sqlite: (default): use sqlite
             - mariadb: use mariadb
@@ -233,12 +234,12 @@ Options:
             - 16    maintained until 2028-11-09
 
     -g
-        Only with -s acceptance
+        Only with -s acceptance|acceptanceComposer
         Activate selenium grid as local port to watch browser clicking around. Can be surfed using
         http://localhost:7900/. A browser tab is opened automatically if xdg-open is installed.
 
     -x
-        Only with -s functional|unit|acceptance
+        Only with -s functional|unit|acceptance|acceptanceComposer
         Send information to host instance for test or system under test break points. This is especially
         useful if a local PhpStorm instance is listening on default xdebug port 9003. A different port
         can be selected with -y
@@ -564,6 +565,71 @@ case ${TEST_SUITE} in
                 ;;
         esac
         ;;
+    acceptanceComposer)
+        rm -rf "${CORE_ROOT}/.Build/Web/typo3temp/var/tests/acceptance-composer" "${CORE_ROOT}/.Build/Web/typo3temp/var/tests/AcceptanceReports"
+
+        PREPAREPARAMS=""
+        TESTPARAMS=""
+        case ${DBMS} in
+            mariadb)
+                ${CONTAINER_BIN} run --rm ${CI_PARAMS} --name mariadb-ac-${SUFFIX} --network ${NETWORK} -d -e MYSQL_ROOT_PASSWORD=acp -e MYSQL_DATABASE=ac_test --tmpfs /var/lib/mysql/:rw,noexec,nosuid ${IMAGE_MARIADB} >/dev/null
+                waitFor mariadb-ac-${SUFFIX} 3306
+                PREPAREPARAMS="-e TYPO3_DB_DRIVER=mysqli -e TYPO3_DB_DBNAME=ac_test -e TYPO3_DB_USERNAME=root -e TYPO3_DB_PASSWORD=acp -e TYPO3_DB_HOST=mariadb-ac-${SUFFIX} -e TYPO3_DB_PORT=3306"
+                TESTPARAMS="-e typo3DatabaseName=ac_test -e typo3DatabaseUsername=root -e typo3DatabasePassword=acp -e typo3DatabaseHost=mariadb-ac-${SUFFIX}"
+                ;;
+            mysql)
+                ${CONTAINER_BIN} run --rm ${CI_PARAMS} --name mysql-ac-${SUFFIX} --network ${NETWORK} -d -e MYSQL_ROOT_PASSWORD=acp -e MYSQL_DATABASE=ac_test --tmpfs /var/lib/mysql/:rw,noexec,nosuid ${IMAGE_MYSQL} >/dev/null
+                waitFor mysql-ac-${SUFFIX} 3306
+                PREPAREPARAMS="-e TYPO3_DB_DRIVER=mysqli -e TYPO3_DB_DBNAME=ac_test -e TYPO3_DB_USERNAME=root -e TYPO3_DB_PASSWORD=acp -e TYPO3_DB_HOST=mysql-ac-${SUFFIX} -e TYPO3_DB_PORT=3306"
+                TESTPARAMS="-e typo3DatabaseName=ac_test -e typo3DatabaseUsername=root -e typo3DatabasePassword=acp -e typo3DatabaseHost=mysql-ac-${SUFFIX}"
+                ;;
+            postgres)
+                ${CONTAINER_BIN} run --rm ${CI_PARAMS} --name postgres-ac-${SUFFIX} --network ${NETWORK} -d -e POSTGRES_DB=ac_test -e POSTGRES_PASSWORD=acp -e POSTGRES_USER=ac_test --tmpfs /var/lib/postgresql/data:rw,noexec,nosuid ${IMAGE_POSTGRES} >/dev/null
+                waitFor postgres-ac-${SUFFIX} 5432
+                PREPAREPARAMS="-e TYPO3_DB_DRIVER=postgres -e TYPO3_DB_DBNAME=ac_test -e TYPO3_DB_USERNAME=ac_test -e TYPO3_DB_PASSWORD=acp -e TYPO3_DB_HOST=postgres-ac-${SUFFIX} -e TYPO3_DB_PORT=5432"
+                TESTPARAMS="-e typo3DatabaseDriver=pdo_pgsql -e typo3DatabaseName=ac_test -e typo3DatabaseUsername=ac_test -e typo3DatabasePassword=acp -e typo3DatabaseHost=postgres-ac-${SUFFIX}"
+                ;;
+            sqlite)
+                PREPAREPARAMS="-e TYPO3_DB_DRIVER=sqlite"
+                TESTPARAMS="-e typo3DatabaseDriver=pdo_sqlite"
+                ;;
+        esac
+
+        ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name acceptance-composer-prepare-${SUFFIX} ${XDEBUG_MODE} -e COMPOSER_CACHE_DIR=${CORE_ROOT}/.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" -e TYPO3=${TYPO3} ${PREPAREPARAMS} ${IMAGE_PHP} "${CORE_ROOT}/Build/Scripts/setupAcceptanceComposer.sh" ".Build/Web/typo3temp/var/tests/acceptance-composer"
+        SUITE_EXIT_CODE=$?
+        if [[ ${SUITE_EXIT_CODE} -eq 0 ]]; then
+            CODECEPION_ENV="--env ci,composer"
+            if [ "${ACCEPTANCE_HEADLESS}" -eq 1 ]; then
+                CODECEPION_ENV="--env ci,composer,headless"
+            fi
+            COMMAND=(.Build/vendor/codeception/codeception/codecept run Backend -d -c Tests/codeception.yml ${CODECEPION_ENV} "$@" --html reports.html)
+            SELENIUM_GRID=""
+            if [ "${ACCEPTANCE_HEADLESS}" -eq 0 ]; then
+                SELENIUM_GRID="-p 7900:7900 -e SE_VNC_NO_PASSWORD=1 -e VNC_NO_PASSWORD=1"
+            fi
+            APACHE_OPTIONS="-e APACHE_RUN_USER=#${HOST_UID} -e APACHE_RUN_SERVERNAME=web -e APACHE_RUN_GROUP=#${HOST_PID} -e APACHE_RUN_DOCROOT=${CORE_ROOT}/.Build/Web/typo3temp/var/tests/acceptance-composer/public -e PHPFPM_HOST=phpfpm -e PHPFPM_PORT=9000"
+            ${CONTAINER_BIN} run --rm ${CI_PARAMS} -d ${SELENIUM_GRID} --name ac-chrome-${SUFFIX} --network ${NETWORK} --network-alias chrome --tmpfs /dev/shm:rw,nosuid,nodev,noexec ${IMAGE_SELENIUM} >/dev/null
+            if [ ${CONTAINER_BIN} = "docker" ]; then
+                ${CONTAINER_BIN} run --rm -d --name ac-phpfpm-${SUFFIX} --network ${NETWORK} --network-alias phpfpm --add-host "${CONTAINER_HOST}:host-gateway" ${USERSET} -e PHPFPM_USER=${HOST_UID} -e PHPFPM_GROUP=${HOST_PID} -v ${CORE_ROOT}:${CORE_ROOT} ${IMAGE_PHP} php-fpm ${PHP_FPM_OPTIONS} >/dev/null
+                ${CONTAINER_BIN} run --rm -d --name ac-web-${SUFFIX} --network ${NETWORK} --network-alias web --add-host "${CONTAINER_HOST}:host-gateway" -v ${CORE_ROOT}:${CORE_ROOT} ${APACHE_OPTIONS} ${IMAGE_APACHE} >/dev/null
+            else
+                ${CONTAINER_BIN} run --rm ${CI_PARAMS} -d --name ac-phpfpm-${SUFFIX} --network ${NETWORK} --network-alias phpfpm ${USERSET} -e PHPFPM_USER=0 -e PHPFPM_GROUP=0 -v ${CORE_ROOT}:${CORE_ROOT} ${IMAGE_PHP} php-fpm -R ${PHP_FPM_OPTIONS} >/dev/null
+                ${CONTAINER_BIN} run --rm ${CI_PARAMS} -d --name ac-web-${SUFFIX} --network ${NETWORK} --network-alias web -v ${CORE_ROOT}:${CORE_ROOT} ${APACHE_OPTIONS} ${IMAGE_APACHE} >/dev/null
+            fi
+            waitFor chrome 4444
+            if [ "${ACCEPTANCE_HEADLESS}" -eq 0 ]; then
+                waitFor chrome 7900
+            fi
+            waitFor web 80
+            if [ "${ACCEPTANCE_HEADLESS}" -eq 0 ] && type "xdg-open" >/dev/null; then
+                xdg-open http://localhost:7900/?autoconnect=1 >/dev/null
+            elif [ "${ACCEPTANCE_HEADLESS}" -eq 0 ] && type "open" >/dev/null; then
+                open http://localhost:7900/?autoconnect=1 >/dev/null
+            fi
+            ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name ac-${DBMS}-composer-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${TESTPARAMS} ${IMAGE_PHP} "${COMMAND[@]}"
+            SUITE_EXIT_CODE=$?
+        fi
+        ;;
     cgl)
           # Active dry-run for cgl needs not "-n" but specific options
           if [ -n "${CGLCHECK_DRY_RUN}" ]; then
diff --git a/Build/Scripts/setupAcceptanceComposer.sh b/Build/Scripts/setupAcceptanceComposer.sh
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+#
+# Set up a composer-installed TYPO3 test instance for acceptance testing.
+# Called by runTests.sh -s acceptanceComposer.
+#
+# Creates symlinks so that Build/composer/composer.dist.json can reference
+# local paths with short names instead of deeply-nested relative URLs.
+# Mirrors the approach used in the TYPO3 core's setupAcceptanceComposer.sh.
+#
+
+set -e
+
+cd "$(dirname $(realpath $0))/../../"
+
+PROJECT_PATH=${1:-.Build/Web/typo3temp/var/tests/acceptance-composer}
+export TYPO3_DB_DRIVER=${TYPO3_DB_DRIVER:-sqlite}
+TYPO3_VERSION="${TYPO3:-14}"
+
+case "${TYPO3_VERSION}" in
+    13)
+        TYPO3_CONSTRAINT="^13.4"
+        ;;
+    14|14-dev|*)
+        TYPO3_CONSTRAINT="^14.3"
+        ;;
+esac
+
+# Compute the relative path from PROJECT_PATH back to the project root.
+# e.g. ".Build/Web/typo3temp/var/tests/acceptance-composer" -> "../../../../../../"
+RELATIVE_ROOT=$(echo "${PROJECT_PATH}" | sed -e 's/[^\/][^\/]*/../g' -e 's/\/$//')
+
+mkdir -p "${PROJECT_PATH}"
+
+# b13-container -> project root   (provides the b13/container path repository)
+# packages      -> Build/tests/packages  (provides typo3tests/dataset-import)
+ln -snf "${RELATIVE_ROOT}" "${PROJECT_PATH}/b13-container"
+ln -snf "${RELATIVE_ROOT}/Build/tests/packages" "${PROJECT_PATH}/packages"
+
+# Generate composer.json from the dist template, substituting the TYPO3 constraint.
+sed "s/TYPO3_CONSTRAINT/${TYPO3_CONSTRAINT}/g" Build/composer/composer.dist.json > "${PROJECT_PATH}/composer.json"
+
+cd "${PROJECT_PATH}"
+rm -rf composer.lock config/ public/ var/ vendor/
+
+mkdir -p "config/system/"
+cat > "config/system/additional.php" <<\EOF
+<?php
+$GLOBALS['TYPO3_CONF_VARS']['BE']['debug'] = true;
+// "Temporary Password - 123"
+$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] = '$argon2i$v=19$m=65536,t=16,p=1$c3hCMGVXOHhRd0M3MzhSVw$WPQHpElapKMxsxfSkkXw5YQxGKN+rGmjM8vQv3g79YY';
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['displayErrors'] = true;
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['devIPmask'] = '*';
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['exceptionalErrors'] = E_ALL;
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] = E_ALL;
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern'] = '.*';
+$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor'] = 'GraphicsMagick';
+$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport'] = 'mbox';
+$GLOBALS['TYPO3_CONF_VARS']['MAIL']['transport_mbox_file'] = \TYPO3\CMS\Core\Core\Environment::getVarPath() . '/log/mail.mbox';
+EOF
+
+EXTRA_PACKAGES=""
+if [ "${TYPO3_VERSION}" = "13" ]; then
+    EXTRA_PACKAGES="ichhabrecht/content-defender:*"
+fi
+
+# `composer require` implicitly performs an initial install since there is no composer.lock.
+composer require --no-progress --no-interaction --dev \
+    typo3tests/dataset-import:@dev \
+    typo3/testing-framework:^9.1 \
+    ${EXTRA_PACKAGES}
+
+TYPO3_SERVER_TYPE=apache \
+TYPO3_PROJECT_NAME="Container Test" \
+vendor/bin/typo3 setup --force --no-interaction
+
+# Import acceptance test fixtures. vendor/b13/container symlinks back to the
+# project root via the b13-container path repository.
+FIXTURES="vendor/b13/container/Tests/Acceptance/Fixtures"
+vendor/bin/typo3 dataset:import "${FIXTURES}/be_users.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/be_groups.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/sys_workspace.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pages.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/contentDefenderMaxitems.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/contentTCASelectCtype.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/emptyPage.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithContainer.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithContainer-2.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithContainer-3.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithContainer-4.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithContainer-5.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithContainer-6.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithDifferentContainers.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithLocalization.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithLocalizationFreeModeWithContainer.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithTranslatedContainer.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithTranslatedContainer-2.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithWorkspace.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithWorkspace-movedContainer.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithWorkspace-changedContainer.csv"
+vendor/bin/typo3 dataset:import "${FIXTURES}/pageWithContainerAndContentElementOutside.csv"
