From 86f057b0ae7f4c11c526bc32912a6b187ef71ac8 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Tue, 17 Sep 2024 14:14:10 +0200 Subject: [PATCH] Include `composer normalize` in the `fix` command --- Build/Scripts/runTests.sh | 2 -- composer.json | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index 51484a2..5a6f740 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -544,8 +544,6 @@ case ${TEST_SUITE} in fix) COMMAND="composer fix" ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-command-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/sh -c "${COMMAND}" - COMMAND="composer normalize" - ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name composer-command-${SUFFIX} -e COMPOSER_CACHE_DIR=.cache/composer -e COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} ${IMAGE_PHP} /bin/sh -c "${COMMAND}" COMMAND="echo ${HELP_TEXT_NPM_CI}; npm ci --silent || { echo ${HELP_TEXT_NPM_FAILURE}; exit 1; } && npm run fix:lint:js" ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name npm-command-${SUFFIX} ${IMAGE_NODE} /bin/sh -c "${COMMAND}" COMMAND="echo ${HELP_TEXT_NPM_CI}; npm ci --silent || { echo ${HELP_TEXT_NPM_FAILURE}; exit 1; } && npm run fix:lint:css" diff --git a/composer.json b/composer.json index 3876efc..30ec722 100644 --- a/composer.json +++ b/composer.json @@ -172,7 +172,10 @@ "ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' \\( -name '*.yaml' -o -name '*.yml' \\) | xargs -r php ./.Build/bin/yaml-lint", "coverage:create-directories": "mkdir -p build/coverage build/logs", "docs:generate": "docker run --rm --pull always -v $(pwd):/project -it ghcr.io/typo3-documentation/render-guides:latest --config=Documentation", - "fix": "@fix:php", + "fix": [ + "@fix:composer:normalize", + "@fix:php" + ], "fix:composer:normalize": "@composer normalize --no-check-lock", "fix:php": [ "@fix:php:cs",