diff --git a/CHANGELOG.md b/CHANGELOG.md index 55ae493c..629d3a53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`4.8.0...main`][4.8.0...main]. +For a full diff see [`4.9.0...main`][4.9.0...main]. + +## [`4.9.0`][4.9.0] + +For a full diff see [`4.8.0...4.9.0`][4.7.0...4.9.0]. + +### Changed + +- Configured `no_trailing_comma_in_singleline` fixer to include `group_import` ([#655]), by [@dependabot] ## [`4.8.0`][4.8.0] @@ -603,7 +611,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [4.5.3...4.6.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.3...4.6.0 [4.6.0...4.7.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.6.0...4.7.0 [4.7.0...4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.0...4.8.0 -[4.8.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.8.0...main +[4.8.0...4.9.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.8.0...4.9.0 +[4.9.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.9.0...main [#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3 [#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14 @@ -743,6 +752,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#645]: https://github.com/ergebnis/php-cs-fixer-config/pull/645 [#646]: https://github.com/ergebnis/php-cs-fixer-config/pull/646 [#651]: https://github.com/ergebnis/php-cs-fixer-config/pull/651 +[#655]: https://github.com/ergebnis/php-cs-fixer-config/pull/655 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index ed3a216c..041ee041 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -349,6 +349,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'arguments', 'array', 'array_destructuring', + 'group_import', ], ], 'no_trailing_whitespace' => true, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 0f817205..26481d6d 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -350,6 +350,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'arguments', 'array', 'array_destructuring', + 'group_import', ], ], 'no_trailing_whitespace' => true, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index b569d79f..198ce73a 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -350,6 +350,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'arguments', 'array', 'array_destructuring', + 'group_import', ], ], 'no_trailing_whitespace' => true, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 94580949..45b1085a 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -355,6 +355,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'arguments', 'array', 'array_destructuring', + 'group_import', ], ], 'no_trailing_whitespace' => true, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 1dcc946c..ff4965a0 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -356,6 +356,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'arguments', 'array', 'array_destructuring', + 'group_import', ], ], 'no_trailing_whitespace' => true, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index c90ae7a6..2542a2e9 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -356,6 +356,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'arguments', 'array', 'array_destructuring', + 'group_import', ], ], 'no_trailing_whitespace' => true,