From 5372fb2e97b67a4a268905826f6c05c15cb28122 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Mon, 15 Dec 2025 23:04:01 +0100 Subject: [PATCH 1/3] modernize calling the tool --- .github/workflows/integrate.yaml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 021babda87..db1b6dea13 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -95,7 +95,7 @@ jobs: run: "composer install --ansi --no-interaction --no-progress" - name: "Run friendsofphp/php-cs-fixer" - run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --show-progress=dots --verbose" + run: "vendor/bin/php-cs-fixer check --diff --show-progress=dots --verbose --ansi" - name: "Get libxml2-utils" run: | diff --git a/Makefile b/Makefile index 2d6e571924..0e1feee7a9 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ code-coverage: vendor ## Collects code coverage from running unit tests with php .PHONY: coding-standards coding-standards: vendor ## Fixes code style issues with friendsofphp/php-cs-fixer - vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --show-progress=dots --verbose + vendor/bin/php-cs-fixer fix --diff --show-progress=dots --verbose .PHONY: help help: ## Displays this list of targets with descriptions From 4a0d9775c9178db89d81734b2ba00302e025f25e Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Mon, 15 Dec 2025 23:04:39 +0100 Subject: [PATCH 2/3] use _dist_ pattern --- .gitignore | 1 + .php-cs-fixer.php => .php-cs-fixer.dist.php | 0 2 files changed, 1 insertion(+) rename .php-cs-fixer.php => .php-cs-fixer.dist.php (100%) diff --git a/.gitignore b/.gitignore index 5fa5cd36ef..f59a0e8c75 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.build/ +/.php-cs-fixer.php /vendor/ backend/mirror.gif diff --git a/.php-cs-fixer.php b/.php-cs-fixer.dist.php similarity index 100% rename from .php-cs-fixer.php rename to .php-cs-fixer.dist.php From a7e0d9adf4fcc46b83c8260fad67d96f1b5dc0c5 Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Mon, 15 Dec 2025 23:06:07 +0100 Subject: [PATCH 3/3] update usage of deprecated rule --- .php-cs-fixer.dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index feb6b4a4dd..49f50d793b 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -35,6 +35,7 @@ 'indentation_type' => true, 'is_null' => true, 'line_ending' => true, + 'modifier_keywords' => true, 'new_with_parentheses' => true, 'no_extra_blank_lines' => true, 'no_mixed_echo_print' => true, @@ -64,7 +65,6 @@ ], 'trim_array_spaces' => true, 'unary_operator_spaces' => true, - 'visibility_required' => true, 'void_return' => true, 'whitespace_after_comma_in_array' => true, ]);