From a8d956a1092e61c32648235228a4cc005bd4ef8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Mon, 8 Jul 2024 01:11:44 +0200 Subject: [PATCH 1/5] [TASK] Move pph sniff to build dir --- phpcs.xml => Build/phpcs/phpcs.xml | 0 composer.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename phpcs.xml => Build/phpcs/phpcs.xml (100%) diff --git a/phpcs.xml b/Build/phpcs/phpcs.xml similarity index 100% rename from phpcs.xml rename to Build/phpcs/phpcs.xml diff --git a/composer.json b/composer.json index 513b8845..bc3ed155 100644 --- a/composer.json +++ b/composer.json @@ -147,7 +147,7 @@ "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:mess": "phpmd Classes text Build/phpmd/phpmd.xml", - "ci:php:sniff": "phpcs Classes Configuration Tests", + "ci:php:sniff": "phpcs --standard=Build/php/phpcs.xml Classes Configuration Tests", "ci:php:stan": "phpstan --no-progress -v", "ci:static": [ "@ci:composer:normalize", From 486e16d316602adbf4b2905477c542b078cb1c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Mon, 8 Jul 2024 01:14:54 +0200 Subject: [PATCH 2/5] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0108d650..5d287045 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 sniff configuration to Build dir (#1357) - Move xliff configuration to Build xliff dir (#1356) - Move tests configuration to Build dir (#1352) - Stop storing development tool PHARs in the repository (#1277) From 06ce339b3805c760beb69eac30f3437041378368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Mon, 8 Jul 2024 01:15:27 +0200 Subject: [PATCH 3/5] Fix path --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index bc3ed155..efe83a29 100644 --- a/composer.json +++ b/composer.json @@ -178,7 +178,7 @@ "@fix:php:sniff" ], "fix:php:cs": "php-cs-fixer fix --config .php-cs-fixer.php", - "fix:php:sniff": "phpcbf Classes Configuration Tests", + "fix:php:sniff": "phpcbf --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", "phpstan:baseline": "phpstan --generate-baseline --allow-empty-baseline", "prepare-release": [ "rm -rf .Build", @@ -202,7 +202,6 @@ "rm package-lock.json", "rm package.json", "rm phive.xml", - "rm phpcs.xml", "rm phpstan-baseline.neon", "rm phpstan.neon", "rm rector.php", From 859167fd30ffafa3c852a373296ce8ad142d834b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Tue, 17 Sep 2024 11:27:59 +0200 Subject: [PATCH 4/5] Add to gitattributes --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 59bf335d..88ab648d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,7 +18,6 @@ /package-lock.json export-ignore /package.json export-ignore /phive.xml export-ignore -/phpcs.xml export-ignore /phpstan-baseline.neon export-ignore /phpstan.neon export-ignore /rector.php export-ignore From fdf11975e9222c46dab3f34fe5296c15607dfc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Tue, 17 Sep 2024 11:34:05 +0200 Subject: [PATCH 5/5] Update composer.json Co-authored-by: Oliver Klee --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index efe83a29..d5de972a 100644 --- a/composer.json +++ b/composer.json @@ -147,7 +147,7 @@ "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:mess": "phpmd Classes text Build/phpmd/phpmd.xml", - "ci:php:sniff": "phpcs --standard=Build/php/phpcs.xml Classes Configuration Tests", + "ci:php:sniff": "phpcs --standard=Build/phpcs/phpcs.xml Classes Configuration Tests", "ci:php:stan": "phpstan --no-progress -v", "ci:static": [ "@ci:composer:normalize",