From 7c770a896df41a0089a6916ab0c2eaaf5fc9a247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Wed, 3 Jul 2024 00:28:37 +0200 Subject: [PATCH 1/5] [TASK] Move php-cs-fixer to build dir Part of: #1186 --- .php-cs-fixer.php => Build/php-cs-fixer/.php-cs-fixer.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .php-cs-fixer.php => Build/php-cs-fixer/.php-cs-fixer.php (100%) 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 From 1d675591a4378a03a27851020420f2165c03c0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Wed, 3 Jul 2024 00:33:29 +0200 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d28704..2f1807e 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) From 0761e73a07ee3f248f851b61228ea4ced3a40dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Tue, 17 Sep 2024 12:50:26 +0200 Subject: [PATCH 3/5] Apply changes from CR --- .gitattributes | 1 - Build/php-cs-fixer/{.php-cs-fixer.php => php-cs-fixer.php} | 0 composer.json | 5 ++--- 3 files changed, 2 insertions(+), 4 deletions(-) rename Build/php-cs-fixer/{.php-cs-fixer.php => php-cs-fixer.php} (100%) diff --git a/.gitattributes b/.gitattributes index 88ab648..05ab302 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/Build/php-cs-fixer/.php-cs-fixer.php b/Build/php-cs-fixer/php-cs-fixer.php similarity index 100% rename from Build/php-cs-fixer/.php-cs-fixer.php rename to Build/php-cs-fixer/php-cs-fixer.php diff --git a/composer.json b/composer.json index dce00d8..da11816 100644 --- a/composer.json +++ b/composer.json @@ -144,7 +144,7 @@ "@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-cs-fixer/php-cs-fixer.php -v --dry-run --diff", "ci:php:lint": "parallel-lint .*.php *.php Classes Configuration Tests", "ci:php:mess": "phpmd Classes text Build/phpmd/phpmd.xml", "ci:php:sniff": "phpcs --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", @@ -177,7 +177,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:sniff": "phpcbf --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", "phpstan:baseline": "phpstan --generate-baseline --allow-empty-baseline", "prepare-release": [ @@ -195,7 +195,6 @@ "rm .gitignore", "rm .npmrc", "rm .nvmrc", - "rm .php-cs-fixer.php", "rm .prettierrc.js", "rm package-lock.json", "rm package.json", From ec2a8dd52809c2a23255f71b8360642e87d28f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Tue, 17 Sep 2024 12:51:46 +0200 Subject: [PATCH 4/5] Adapt also php lint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index da11816..8bd8788 100644 --- a/composer.json +++ b/composer.json @@ -145,7 +145,7 @@ "@ci:php:stan" ], "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 *.php Classes Configuration Tests", + "ci:php:lint": "parallel-lint *.php Classes Configuration Tests", "ci:php:mess": "phpmd Classes text Build/phpmd/phpmd.xml", "ci:php:sniff": "phpcs --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", "ci:php:stan": "phpstan --no-progress -v", From 573cc0e580a634064ea33dbd45ddaf5ec8f18315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Tue, 17 Sep 2024 14:44:59 +0200 Subject: [PATCH 5/5] Update php lint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8bd8788..d3c69ee 100644 --- a/composer.json +++ b/composer.json @@ -145,7 +145,7 @@ "@ci:php:stan" ], "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 Classes Configuration Tests", + "ci:php:lint": "parallel-lint *.php Build Classes Configuration Tests", "ci:php:mess": "phpmd Classes text Build/phpmd/phpmd.xml", "ci:php:sniff": "phpcs --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", "ci:php:stan": "phpstan --no-progress -v",