Skip to content

Commit

Permalink
[TASK] Use typoscript instead of ts within script names (#1392)
Browse files Browse the repository at this point in the history
As ts is usually understood as TypeScript instead of TypoScript.
TYPO3 itself also changed its file extension from `.ts` to `.typoscript`.
We reflect that by adopting the script name.

Resolves: #1385
  • Loading branch information
DanielSiepmann authored Jul 29, 2024
1 parent 3dca33e commit 5a25569
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
- "php:cs-fixer"
- "php:sniff"
- "php:stan"
- "ts:lint"
- "typoscript:lint"
- "yaml:lint"
- "xliff:lint"
php-version:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/pipeline/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ include:
- '/.gitlab/pipeline/jobs/php-lint-php8.3.yml'
- '/.gitlab/pipeline/jobs/phpcs.yml'
- '/.gitlab/pipeline/jobs/php-cs-fixer.yml'
- '/.gitlab/pipeline/jobs/ts-lint.yml'
- '/.gitlab/pipeline/jobs/typoscript-lint.yml'
- '/.gitlab/pipeline/jobs/unit-php7.4-v11-highest.yml'
- '/.gitlab/pipeline/jobs/unit-php7.4-v11-lowest.yml'
- '/.gitlab/pipeline/jobs/unit-php8.0-v11-highest.yml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ts-lint:
needs:
- build-composer-dependencies
script:
- composer ci:ts:lint
- composer ci:typoscript:lint
2 changes: 1 addition & 1 deletion Build/Scripts/runTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ case ${TEST_SUITE} in
esac
;;
lintTypoScript)
COMMAND="composer ci:ts:lint"
COMMAND="composer ci:typoscript:lint"
${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}"
SUITE_EXIT_CODE=$?
;;
Expand Down
4 changes: 2 additions & 2 deletions Documentation/Running.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ Checks the PHP types using PHPStan.
Runs all static code checks (syntax, style, types).

.. index:: Commands; composer ci:ts:lint
.. index:: Commands; composer ci:typoscript:lint
.. code-block:: bash
composer ci:ts:lint
composer ci:typoscript:lint
Lints the TypoScript files.

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
"@ci:php:lint",
"@ci:php:sniff",
"@ci:php:stan",
"@ci:ts:lint",
"@ci:typoscript:lint",
"@ci:xliff:lint",
"@ci:yaml:lint"
],
Expand All @@ -164,7 +164,7 @@
"find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \\\"Running functional test suite {}\\\"; .Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml {}';"
],
"ci:tests:unit": ".Build/bin/phpunit -c Build/phpunit/UnitTests.xml Tests/Unit",
"ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript",
"ci:typoscript:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript",
"ci:xliff:lint": "php Build/xliff/xliff-lint lint:xliff Resources/Private/Language",
"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/logs .Build/coverage",
Expand Down Expand Up @@ -223,7 +223,7 @@
"ci:tests:create-directories": "Creates the directories required to smoothely run the functional tests.",
"ci:tests:functional": "Runs the functional tests.",
"ci:tests:unit": "Runs the unit tests.",
"ci:ts:lint": "Lints the TypoScript files.",
"ci:typoscript:lint": "Lints the TypoScript files.",
"ci:xliff:lint": "Lints the XLIFF files.",
"ci:yaml:lint": "Lints the YAML files.",
"coverage:create-directories": "Creates the directories needed for recording and merging the code coverage reports.",
Expand Down

0 comments on commit 5a25569

Please sign in to comment.