Skip to content

Commit

Permalink
Merge pull request #1021 from ergebnis/dependabot/composer/friendsofp…
Browse files Browse the repository at this point in the history
…hp/php-cs-fixer-3.50.0

composer(deps): Bump friendsofphp/php-cs-fixer from 3.49.0 to 3.50.0
  • Loading branch information
localheinz authored Feb 24, 2024
2 parents 9cf9553 + 43ac2f7 commit c16ce3a
Show file tree
Hide file tree
Showing 29 changed files with 74 additions and 19 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

For a full diff see [`6.22.0...main`][6.22.0...main].

### Changed

- Updated `friendsofphp/php-cs-fixer` ([#1021]), by [@dependabot]

## [`6.22.0`][6.22.0]

For a full diff see [`6.21.0...6.22.0`][6.21.0...6.22.0].
Expand Down Expand Up @@ -1548,6 +1552,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#1005]: https://github.com/ergebnis/php-cs-fixer-config/pull/1005
[#1009]: https://github.com/ergebnis/php-cs-fixer-config/pull/1009
[#1010]: https://github.com/ergebnis/php-cs-fixer-config/pull/1010
[#1021]: https://github.com/ergebnis/php-cs-fixer-config/pull/1021

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-filter": "*",
"erickskrauch/php-cs-fixer-custom-fixers": "~1.2.4",
"friendsofphp/php-cs-fixer": "~3.49.0",
"friendsofphp/php-cs-fixer": "~3.50.0",
"kubawerlos/php-cs-fixer-custom-fixers": "~3.20.0"
},
"require-dev": {
Expand Down
34 changes: 16 additions & 18 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/RuleSet/Php53.php
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -546,6 +547,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php54.php
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -547,6 +548,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php55.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -553,6 +554,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php56.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -553,6 +554,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php70.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -551,6 +552,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php71.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -553,6 +554,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php72.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -553,6 +554,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php73.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -553,6 +554,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php74.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -553,6 +554,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php80.php
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -563,6 +564,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php81.php
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -565,6 +566,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php82.php
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -565,6 +566,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions src/RuleSet/Php83.php
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ public static function create(): RuleSet
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -565,6 +566,7 @@ public static function create(): RuleSet
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions test/Unit/RuleSet/Php53Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ protected function expectedRules(): Rules
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -569,6 +570,7 @@ protected function expectedRules(): Rules
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions test/Unit/RuleSet/Php54Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ protected function expectedRules(): Rules
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -570,6 +571,7 @@ protected function expectedRules(): Rules
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
2 changes: 2 additions & 0 deletions test/Unit/RuleSet/Php55Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ protected function expectedRules(): Rules
],
'no_superfluous_elseif' => true,
'no_superfluous_phpdoc_tags' => [
'allow_hidden_params' => false,
'allow_mixed' => true,
'allow_unused_params' => false,
'remove_inheritdoc' => false,
Expand Down Expand Up @@ -576,6 +577,7 @@ protected function expectedRules(): Rules
],
],
'phpdoc_annotation_without_dot' => true,
'phpdoc_array_type' => false,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
Expand Down
Loading

0 comments on commit c16ce3a

Please sign in to comment.