From 67a1c998562ea9bcd781e04017ecd50ef4caf541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 22 Jul 2022 12:47:33 +0200 Subject: [PATCH] Enhancement: Enable no_multiple_statements_per_line fixer --- CHANGELOG.md | 15 +++++++++++++-- src/RuleSet/Php74.php | 2 +- src/RuleSet/Php80.php | 2 +- src/RuleSet/Php81.php | 2 +- test/Unit/RuleSet/Php74Test.php | 2 +- test/Unit/RuleSet/Php80Test.php | 2 +- test/Unit/RuleSet/Php81Test.php | 2 +- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9afcc95..94ef3c54 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.5.3...main`][4.5.3...main]. +For a full diff see [`4.6.0...main`][4.6.0...main]. + +## [`4.6.0`][4.6.0] + +For a full diff see [`4.5.3...4.6.0`][4.5.3...4.6.0]. + +### Changed + +- Enabled `no_multiple_statements_per_line` fixer ([#637]), by [@localheinz] ### Fixed @@ -522,6 +530,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [4.5.1]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.5.1 [4.5.2]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.5.2 [4.5.3]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.5.3 +[4.6.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.6.0 [d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0 [1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0 @@ -567,7 +576,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [4.5.0...4.5.1]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.0...4.5.1 [4.5.1...4.5.2]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.1...4.5.2 [4.5.2...4.5.3]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.2...4.5.3 -[4.5.3...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.3...main +[4.5.3...4.6.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.3...4.6.0 +[4.6.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.6.0...main [#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3 [#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14 @@ -701,6 +711,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#632]: https://github.com/ergebnis/php-cs-fixer-config/pull/632 [#633]: https://github.com/ergebnis/php-cs-fixer-config/pull/633 [#636]: https://github.com/ergebnis/php-cs-fixer-config/pull/636 +[#637]: https://github.com/ergebnis/php-cs-fixer-config/pull/637 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index f3d3444e..2ef918ac 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -319,7 +319,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'use' => 'echo', ], 'no_multiline_whitespace_around_double_arrow' => true, - 'no_multiple_statements_per_line' => false, + 'no_multiple_statements_per_line' => true, 'no_null_property_initialization' => true, 'no_php4_constructor' => false, 'no_short_bool_cast' => true, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 2a2aa8e5..352a44a6 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -320,7 +320,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'use' => 'echo', ], 'no_multiline_whitespace_around_double_arrow' => true, - 'no_multiple_statements_per_line' => false, + 'no_multiple_statements_per_line' => true, 'no_null_property_initialization' => true, 'no_php4_constructor' => false, 'no_short_bool_cast' => true, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index f598c6aa..52334ae1 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -320,7 +320,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'use' => 'echo', ], 'no_multiline_whitespace_around_double_arrow' => true, - 'no_multiple_statements_per_line' => false, + 'no_multiple_statements_per_line' => true, 'no_null_property_initialization' => true, 'no_php4_constructor' => false, 'no_short_bool_cast' => true, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index f0e5ea39..9502b0e2 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -325,7 +325,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'use' => 'echo', ], 'no_multiline_whitespace_around_double_arrow' => true, - 'no_multiple_statements_per_line' => false, + 'no_multiple_statements_per_line' => true, 'no_null_property_initialization' => true, 'no_php4_constructor' => false, 'no_short_bool_cast' => true, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 7262f25f..cc8d5b12 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -326,7 +326,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'use' => 'echo', ], 'no_multiline_whitespace_around_double_arrow' => true, - 'no_multiple_statements_per_line' => false, + 'no_multiple_statements_per_line' => true, 'no_null_property_initialization' => true, 'no_php4_constructor' => false, 'no_short_bool_cast' => true, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index c562f029..77866b74 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -326,7 +326,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'use' => 'echo', ], 'no_multiline_whitespace_around_double_arrow' => true, - 'no_multiple_statements_per_line' => false, + 'no_multiple_statements_per_line' => true, 'no_null_property_initialization' => true, 'no_php4_constructor' => false, 'no_short_bool_cast' => true,