diff --git a/.gitattributes b/.gitattributes index 88ab648d..05ab302b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,7 +7,6 @@ /.gitlab/ export-ignore /.npmrc export-ignore /.nvmrc export-ignore -/.php-cs-fixer.php export-ignore /.prettierrc.js export-ignore /Build/ export-ignore /Configuration/FunctionalTests.xml export-ignore diff --git a/.php-cs-fixer.php b/Build/php-cs-fixer/php-cs-fixer.php similarity index 100% rename from .php-cs-fixer.php rename to Build/php-cs-fixer/php-cs-fixer.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d287045..2f1807ef 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 php-cs-fixer configuration to Build dir (#1353) - Move php sniff configuration to Build dir (#1357) - Move xliff configuration to Build xliff dir (#1356) - Move tests configuration to Build dir (#1352) diff --git a/composer.json b/composer.json index 83395ba0..ce5444f2 100644 --- a/composer.json +++ b/composer.json @@ -144,8 +144,8 @@ "@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:lint": "parallel-lint .*.php *.php Classes Configuration Tests", + "ci:php:cs-fixer": "php-cs-fixer fix --config ./Build/php-cs-fixer/php-cs-fixer.php -v --dry-run --diff", + "ci:php:lint": "parallel-lint *.php Build Classes Configuration Tests", "ci:php:mess": "phpmd Classes text Build/phpmd/phpmd.xml", "ci:php:rector": "rector --dry-run", "ci:php:sniff": "phpcs --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", @@ -184,7 +184,7 @@ "@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-cs-fixer/php-cs-fixer.php", "fix:php:rector": "rector", "fix:php:sniff": "phpcbf --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", "phpstan:baseline": "phpstan --generate-baseline --allow-empty-baseline", @@ -203,7 +203,6 @@ "rm .gitignore", "rm .npmrc", "rm .nvmrc", - "rm .php-cs-fixer.php", "rm .prettierrc.js", "rm package-lock.json", "rm package.json",