Skip to content

Commit

Permalink
Merge pull request #637 from ergebnis/feature/no-multiple-statements-…
Browse files Browse the repository at this point in the history
…per-line

Enhancement: Enable `no_multiple_statements_per_line` fixer
  • Loading branch information
localheinz authored Jul 22, 2022
2 parents 574dfc2 + 67a1c99 commit 9bbf949
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 8 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/RuleSet/Php74.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/RuleSet/Php80.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/RuleSet/Php81.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/RuleSet/Php74Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/RuleSet/Php80Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion test/Unit/RuleSet/Php81Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9bbf949

Please sign in to comment.