Skip to content

Commit

Permalink
Merge pull request #662 from ergebnis/feature/no-useless-concat-operator
Browse files Browse the repository at this point in the history
Enhancement: Enable and configure `no_useless_concat_operator` fixer
  • Loading branch information
localheinz authored Oct 13, 2022
2 parents ad8a971 + f4022db commit 413f876
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ For a full diff see [`4.9.0...main`][4.9.0...main].
### Changed

- Updated `friendsofphp/php-cs-fixer` ([#661]), by [@dependabot]
- Enabled and configured `no_useless_concat_operator` fixer ([#662]), by [@localheinz]

## [`4.9.0`][4.9.0]

Expand Down Expand Up @@ -758,6 +759,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#651]: https://github.com/ergebnis/php-cs-fixer-config/pull/651
[#655]: https://github.com/ergebnis/php-cs-fixer-config/pull/655
[#661]: https://github.com/ergebnis/php-cs-fixer-config/pull/661
[#662]: https://github.com/ergebnis/php-cs-fixer-config/pull/662

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
4 changes: 3 additions & 1 deletion src/RuleSet/Php74.php
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,9 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'no_unset_cast' => true,
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => false,
'no_useless_concat_operator' => [
'juggle_simple_strings' => true,
],
'no_useless_else' => true,
'no_useless_nullsafe_operator' => false,
'no_useless_return' => true,
Expand Down
4 changes: 3 additions & 1 deletion src/RuleSet/Php80.php
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,9 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'no_unset_cast' => true,
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => false,
'no_useless_concat_operator' => [
'juggle_simple_strings' => true,
],
'no_useless_else' => true,
'no_useless_nullsafe_operator' => true,
'no_useless_return' => true,
Expand Down
4 changes: 3 additions & 1 deletion src/RuleSet/Php81.php
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,9 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
'no_unset_cast' => true,
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => false,
'no_useless_concat_operator' => [
'juggle_simple_strings' => true,
],
'no_useless_else' => true,
'no_useless_nullsafe_operator' => true,
'no_useless_return' => true,
Expand Down
4 changes: 3 additions & 1 deletion test/Unit/RuleSet/Php74Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,9 @@ final class Php74Test extends ExplicitRuleSetTestCase
'no_unset_cast' => true,
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => false,
'no_useless_concat_operator' => [
'juggle_simple_strings' => true,
],
'no_useless_else' => true,
'no_useless_nullsafe_operator' => false,
'no_useless_return' => true,
Expand Down
4 changes: 3 additions & 1 deletion test/Unit/RuleSet/Php80Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,9 @@ final class Php80Test extends ExplicitRuleSetTestCase
'no_unset_cast' => true,
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => false,
'no_useless_concat_operator' => [
'juggle_simple_strings' => true,
],
'no_useless_else' => true,
'no_useless_nullsafe_operator' => true,
'no_useless_return' => true,
Expand Down
4 changes: 3 additions & 1 deletion test/Unit/RuleSet/Php81Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,9 @@ final class Php81Test extends ExplicitRuleSetTestCase
'no_unset_cast' => true,
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_concat_operator' => false,
'no_useless_concat_operator' => [
'juggle_simple_strings' => true,
],
'no_useless_else' => true,
'no_useless_nullsafe_operator' => true,
'no_useless_return' => true,
Expand Down

0 comments on commit 413f876

Please sign in to comment.