From 18f24289a3831cfd43476459dd01bc4450c036f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 04:45:23 +0000 Subject: [PATCH 1/8] Update friendsofphp/php-cs-fixer requirement from ^2.17 to ^3.95 Updates the requirements on [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) to permit the latest version. - [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases) - [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v2.17.0...v3.95.8) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-version: 3.95.8 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d9880e1..ac0e796 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "phpunit/phpunit": "~8.5 | ~9.5", "squizlabs/php_codesniffer": "^3.5", "corpus/coding-standard": "~0.6.0", - "friendsofphp/php-cs-fixer": "^2.17", + "friendsofphp/php-cs-fixer": "^3.95", "phpstan/phpstan": "^2.2" }, "license": "MIT", From 257312ea86a24b7c05945cc6619be422bd158ac4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Jun 2026 04:52:51 +0000 Subject: [PATCH 2/8] Add php-cs-fixer dry-run to test target --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9fc0f70..9f31020 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,12 @@ fix: cbf phpstan: vendor/bin/phpstan --memory-limit=2G +.PHONY: php-cs-fixer +php-cs-fixer: + vendor/bin/php-cs-fixer fix --dry-run --diff + .PHONY: test -test: cs phpstan +test: cs php-cs-fixer phpstan vendor/bin/phpunit .PHONY: cs From f25a03084d92c75eb649ee7692123a9d4a9c72ab Mon Sep 17 00:00:00 2001 From: Jesse Donat Date: Thu, 18 Jun 2026 23:55:33 -0500 Subject: [PATCH 3/8] Rename .php_cs to .php-cs-fixer.php --- .php_cs => .php-cs-fixer.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .php_cs => .php-cs-fixer.php (100%) diff --git a/.php_cs b/.php-cs-fixer.php similarity index 100% rename from .php_cs rename to .php-cs-fixer.php From eaeb23edb28f749c41aa3355871b1596d82a7c6e Mon Sep 17 00:00:00 2001 From: Jesse Donat Date: Thu, 18 Jun 2026 23:55:59 -0500 Subject: [PATCH 4/8] Rename .php-cs-fixer.php to .php-cs-fixer.dist.php --- .php-cs-fixer.php => .php-cs-fixer.dist.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .php-cs-fixer.php => .php-cs-fixer.dist.php (100%) 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 0772eacaafb78587de0b0097cb37233b697e949c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Jun 2026 04:59:03 +0000 Subject: [PATCH 5/8] Modernize php-cs-fixer configuration --- .php-cs-fixer.dist.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 3f2eac7..19fc73c 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -4,10 +4,11 @@ ->files() ->in(__DIR__ . '/src') ->in(__DIR__ . '/test') + ->in(__DIR__ . '/example') ->name('*.php'); -return PhpCsFixer\Config::create() +return (new PhpCsFixer\Config) ->setUsingCache(true) ->setIndent("\t") ->setLineEnding("\n") @@ -103,7 +104,7 @@ ], 'blank_line_before_statement' => [ - 'statements' => [ 'continue', 'try', 'switch', 'die', 'exit', 'throw', 'return', 'yield', 'do' ], + 'statements' => [ 'continue', 'try', 'switch', 'exit', 'throw', 'return', 'do' ], ], 'no_superfluous_phpdoc_tags' => [ @@ -113,8 +114,6 @@ 'no_useless_else' => true, - 'compact_nullable_typehint' => true, - 'combine_consecutive_issets' => true, 'escape_implicit_backslashes' => true, 'explicit_indirect_variable' => true, @@ -140,6 +139,7 @@ 'method_chaining_indentation' => true, 'method_argument_space' => [ + 'on_multiline' => 'ignore', // at least until they fix it 'keep_multiple_spaces_after_comma' => true, ], @@ -156,10 +156,16 @@ 'import_functions' => false, ], - 'trailing_comma_in_multiline_array' => true, + 'trailing_comma_in_multiline' => true, 'single_line_comment_style' => true, + + 'is_null' => true, + 'yoda_style' => [ + 'equal' => false, + 'identical' => false, + 'less_and_greater' => null, + ], ] ) ->setFinder($finder); - From 38f6d892db1f3aa011dc93e02da5a2d42c55b00f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Jun 2026 04:59:30 +0000 Subject: [PATCH 6/8] Refine php-cs-fixer config update --- .php-cs-fixer.dist.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 19fc73c..c9e9ac6 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -104,7 +104,7 @@ ], 'blank_line_before_statement' => [ - 'statements' => [ 'continue', 'try', 'switch', 'exit', 'throw', 'return', 'do' ], + 'statements' => [ 'continue', 'try', 'switch', 'die', 'exit', 'throw', 'return', 'yield', 'do' ], ], 'no_superfluous_phpdoc_tags' => [ @@ -139,7 +139,7 @@ 'method_chaining_indentation' => true, 'method_argument_space' => [ - 'on_multiline' => 'ignore', // at least until they fix it + 'on_multiline' => 'ignore', 'keep_multiple_spaces_after_comma' => true, ], @@ -168,4 +168,3 @@ ] ) ->setFinder($finder); - From 907f8f25bd069e55f225501e9a595f535813c7e5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Jun 2026 04:59:52 +0000 Subject: [PATCH 7/8] Trim redundant yoda style option --- .php-cs-fixer.dist.php | 1 - 1 file changed, 1 deletion(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index c9e9ac6..30f9fc2 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -163,7 +163,6 @@ 'yoda_style' => [ 'equal' => false, 'identical' => false, - 'less_and_greater' => null, ], ] ) From ab57146fd3111062961aa50d1aa2982b8117fbcd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 19 Jun 2026 05:03:26 +0000 Subject: [PATCH 8/8] Fix blank_line_before_statement config: remove invalid 'die' statement for php-cs-fixer v3.95 --- .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 30f9fc2..58f25a9 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -104,7 +104,7 @@ ], 'blank_line_before_statement' => [ - 'statements' => [ 'continue', 'try', 'switch', 'die', 'exit', 'throw', 'return', 'yield', 'do' ], + 'statements' => [ 'continue', 'try', 'switch', 'exit', 'throw', 'return', 'yield', 'do' ], ], 'no_superfluous_phpdoc_tags' => [