diff --git a/stylelint.config.js b/Build/js/stylelint.config.js similarity index 100% rename from stylelint.config.js rename to Build/js/stylelint.config.js diff --git a/.php-cs-fixer.php b/Build/php/.php-cs-fixer.php similarity index 100% rename from .php-cs-fixer.php rename to Build/php/.php-cs-fixer.php diff --git a/phpcs.xml b/Build/php/phpcs.xml similarity index 100% rename from phpcs.xml rename to Build/php/phpcs.xml diff --git a/phpstan-baseline.neon b/Build/php/phpstan-baseline.neon similarity index 100% rename from phpstan-baseline.neon rename to Build/php/phpstan-baseline.neon diff --git a/phpstan.neon b/Build/php/phpstan.neon similarity index 73% rename from phpstan.neon rename to Build/php/phpstan.neon index 58d6f6de..2c3cfb9a 100644 --- a/phpstan.neon +++ b/Build/php/phpstan.neon @@ -1,9 +1,9 @@ includes: - phpstan-baseline.neon - - .Build/vendor/spaze/phpstan-disallowed-calls/disallowed-dangerous-calls.neon - - .Build/vendor/spaze/phpstan-disallowed-calls/disallowed-execution-calls.neon - - .Build/vendor/spaze/phpstan-disallowed-calls/disallowed-insecure-calls.neon - - .Build/vendor/spaze/phpstan-disallowed-calls/disallowed-loose-calls.neon + - ../../.Build/vendor/spaze/phpstan-disallowed-calls/disallowed-dangerous-calls.neon + - ../../.Build/vendor/spaze/phpstan-disallowed-calls/disallowed-execution-calls.neon + - ../../.Build/vendor/spaze/phpstan-disallowed-calls/disallowed-insecure-calls.neon + - ../../.Build/vendor/spaze/phpstan-disallowed-calls/disallowed-loose-calls.neon parameters: parallel: @@ -13,9 +13,9 @@ parameters: level: 9 paths: - - Classes - - Configuration - - Tests + - ../../Classes + - ../../Configuration + - ../../Tests # Allow instanceof checks, particularly in tests checkAlwaysTrueCheckTypeFunctionCall: false diff --git a/Configuration/FunctionalTests.xml b/Build/tests/FunctionalTests.xml similarity index 94% rename from Configuration/FunctionalTests.xml rename to Build/tests/FunctionalTests.xml index 41d9fb0b..f2da77fe 100644 --- a/Configuration/FunctionalTests.xml +++ b/Build/tests/FunctionalTests.xml @@ -4,7 +4,7 @@ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd" backupGlobals="true" beStrictAboutTestsThatDoNotTestAnything="false" - bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php" + bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php" cacheResult="false" colors="true" convertDeprecationsToExceptions="true" diff --git a/Configuration/UnitTests.xml b/Build/tests/UnitTests.xml similarity index 92% rename from Configuration/UnitTests.xml rename to Build/tests/UnitTests.xml index 4eef49e9..0e1fa6ca 100644 --- a/Configuration/UnitTests.xml +++ b/Build/tests/UnitTests.xml @@ -4,7 +4,7 @@ xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd" backupGlobals="true" beStrictAboutTestsThatDoNotTestAnything="false" - bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php" + bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php" cacheResult="false" colors="true" convertDeprecationsToExceptions="true" diff --git a/Configuration/TsLint.yml b/Build/typoscript/TsLint.yml similarity index 100% rename from Configuration/TsLint.yml rename to Build/typoscript/TsLint.yml diff --git a/Build/bin/xliff-lint b/Build/xliff/xliff-lint similarity index 100% rename from Build/bin/xliff-lint rename to Build/xliff/xliff-lint diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7e5ceb..7816cbcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Add support for PostgreSQL 16 (#1271) ### Changed +- Move all tooling configuration to Build dir (#1202) - Stop storing development tool PHARs in the repository (#1277) - !!! Require a storage PID for the tea list (#1223) - Drop additional namespace segment for the Tea model (#1025) diff --git a/composer.json b/composer.json index 0ab9fb66..81047b5a 100644 --- a/composer.json +++ b/composer.json @@ -124,7 +124,7 @@ "ci:coverage:functional": [ "@ci:tests:create-directories", "@coverage:create-directories", - ".Build/bin/phpunit -c ./Configuration/FunctionalTests.xml --whitelist Classes --coverage-php=.Build/coverage/functional.cov Tests/Functional" + ".Build/bin/phpunit -c ./Build/tests/FunctionalTests.xml --whitelist Classes --coverage-php=.Build/coverage/functional.cov Tests/Functional" ], "ci:coverage:merge": [ "@coverage:create-directories", @@ -132,7 +132,7 @@ ], "ci:coverage:unit": [ "@coverage:create-directories", - ".Build/bin/phpunit -c ./Configuration/UnitTests.xml --whitelist Classes --coverage-php=.Build/coverage/unit.cov Tests/Unit" + ".Build/bin/phpunit -c ./Build/tests/UnitTests.xml --whitelist Classes --coverage-php=.Build/coverage/unit.cov Tests/Unit" ], "ci:json:lint": "find . ! -path '*/.cache/*' ! -path '*/.Build/*' ! -path '*/node_modules/*' -name '*.json' | xargs -r php .Build/bin/jsonlint -q", "ci:php": [ @@ -141,10 +141,10 @@ "@ci:php:sniff", "@ci:php:stan" ], - "ci:php:cs-fixer": "php-cs-fixer fix --config .php-cs-fixer.php -v --dry-run --diff", + "ci:php:cs-fixer": "php-cs-fixer fix --config Build/php/.php-cs-fixer.php -v --dry-run --diff", "ci:php:lint": "find .*.php *.php Classes Configuration Tests -name '*.php' -print0 | xargs -r -0 -n 1 -P 4 php -l", - "ci:php:sniff": "phpcs Classes Configuration Tests", - "ci:php:stan": "phpstan --no-progress", + "ci:php:sniff": "phpcs --standard=Build/php/phpcs.xml Classes Configuration Tests", + "ci:php:stan": ".Build/bin/phpstan analyse -c Build/php/phpstan.neon --no-progress", "ci:static": [ "@ci:composer:normalize", "@ci:json:lint", @@ -159,11 +159,11 @@ "ci:tests:create-directories": "mkdir -p .Build/public/typo3temp/var/tests", "ci:tests:functional": [ "@ci:tests:create-directories", - "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/bin/phpunit -c ./Configuration/FunctionalTests.xml {}';" + "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/bin/phpunit -c Build/tests/FunctionalTests.xml {}';" ], - "ci:tests:unit": ".Build/bin/phpunit -c ./Configuration/UnitTests.xml Tests/Unit", - "ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript", - "ci:xliff:lint": "php Build/bin/xliff-lint lint:xliff Resources/Private/Language", + "ci:tests:unit": ".Build/bin/phpunit -c Build/tests/UnitTests.xml Tests/Unit", + "ci:ts:lint": "typoscript-lint -c Build/typoscript/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", "docs:generate": "docker run --rm --pull always -v $(pwd):/project -it ghcr.io/typo3-documentation/render-guides:latest --config=Documentation", @@ -172,9 +172,9 @@ "@fix:php:cs", "@fix:php:sniff" ], - "fix:php:cs": "php-cs-fixer fix --config .php-cs-fixer.php", + "fix:php:cs": "php-cs-fixer fix --config Build/php/.php-cs-fixer.php", "fix:php:sniff": "phpcbf Classes Configuration Tests", - "phpstan:baseline": ".Build/bin/phpstan --generate-baseline --allow-empty-baseline", + "phpstan:baseline": ".Build/bin/phpstan -c Build/php/phpstan-baseline.neon --generate-baseline --allow-empty-baseline", "prepare-release": [ "rm -rf .Build", "rm -rf .ddev",