Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move all tooling configuration to Build dir #1202

Closed
Closed
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions phpstan.neon → Build/php/phpstan.neon
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -13,9 +13,9 @@ parameters:
level: 9

paths:
- Classes
- Configuration
- Tests
- ../../Classes
- ../../Configuration
- ../../Tests

# Allow instanceof checks, particularly in tests
checkAlwaysTrueCheckTypeFunctionCall: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Configuration/UnitTests.xml → Build/tests/UnitTests.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@
"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",
"@php tools/phpcov merge --clover=./.Build/logs/clover.xml ./.Build/coverage/"
],
"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": [
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
Loading