Skip to content

Commit

Permalink
Enhancement: Enable fix_non_monolithic_code option of no_alternative_…
Browse files Browse the repository at this point in the history
…syntax fixer
  • Loading branch information
localheinz committed Aug 19, 2022
1 parent a0d41c4 commit ded6a26
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 8 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`4.6.0...main`][4.6.0...main].
For a full diff see [`4.7.0...main`][4.7.0...main].

## [`4.7.0`][4.7.0]

For a full diff see [`4.6.0...4.7.0`][4.6.0...4.7.0].

### Changed

- Updated `friendsofphp/php-cs-fixer` ([#642]), by [@dependabot]
- Configured the `whitespace_after_comma_in_array` fixer to ensure a single space using the `ensure_single_space` option ([#645]), by [@localheinz]
- Configured the `no_alternative_syntax` fixer to ensure a single space using the `fix_non_monolithic_code` option ([#646]), by [@localheinz]

### Fixed

Expand Down Expand Up @@ -540,6 +545,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[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
[4.7.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.7.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 @@ -586,7 +592,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[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...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
[4.6.0...4.7.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.6.0...4.7.0
[4.7.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.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 @@ -724,6 +731,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#642]: https://github.com/ergebnis/php-cs-fixer-config/pull/642
[#644]: https://github.com/ergebnis/php-cs-fixer-config/pull/644
[#645]: https://github.com/ergebnis/php-cs-fixer-config/pull/645
[#646]: https://github.com/ergebnis/php-cs-fixer-config/pull/646

[@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 @@ -288,7 +288,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
],
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => [
'fix_non_monolithic_code' => false,
'fix_non_monolithic_code' => true,
],
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => 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 @@ -288,7 +288,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
],
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => [
'fix_non_monolithic_code' => false,
'fix_non_monolithic_code' => true,
],
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => 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 @@ -288,7 +288,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
],
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => [
'fix_non_monolithic_code' => false,
'fix_non_monolithic_code' => true,
],
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => 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 @@ -294,7 +294,7 @@ final class Php74Test extends ExplicitRuleSetTestCase
],
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => [
'fix_non_monolithic_code' => false,
'fix_non_monolithic_code' => true,
],
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => 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 @@ -294,7 +294,7 @@ final class Php80Test extends ExplicitRuleSetTestCase
],
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => [
'fix_non_monolithic_code' => false,
'fix_non_monolithic_code' => true,
],
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => 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 @@ -294,7 +294,7 @@ final class Php81Test extends ExplicitRuleSetTestCase
],
'no_alias_language_construct_call' => true,
'no_alternative_syntax' => [
'fix_non_monolithic_code' => false,
'fix_non_monolithic_code' => true,
],
'no_binary_string' => true,
'no_blank_lines_after_class_opening' => true,
Expand Down

0 comments on commit ded6a26

Please sign in to comment.