Skip to content

Commit

Permalink
Merge pull request #620 from ergebnis/dependabot/composer/friendsofph…
Browse files Browse the repository at this point in the history
…p/php-cs-fixer-3.9.1

composer(deps): bump friendsofphp/php-cs-fixer from 3.8.0 to 3.9.1
  • Loading branch information
localheinz authored Jul 11, 2022
2 parents 5248f5c + e62f83b commit 9e64370
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 47 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 [`4.4.0...main`][4.4.0...main].

### Changed

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

## [`4.4.0`][4.4.0]

For a full diff see [`4.3.0...4.4.0`][4.3.0...4.4.0].
Expand Down Expand Up @@ -634,6 +638,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#591]: https://github.com/ergebnis/php-cs-fixer-config/pull/591
[#592]: https://github.com/ergebnis/php-cs-fixer-config/pull/592
[#593]: https://github.com/ergebnis/php-cs-fixer-config/pull/593
[#620]: https://github.com/ergebnis/php-cs-fixer-config/pull/620

[@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 @@ -17,7 +17,7 @@
"require": {
"php": "^7.4 || ^8.0",
"ext-filter": "*",
"friendsofphp/php-cs-fixer": "~3.8.0"
"friendsofphp/php-cs-fixer": "~3.9.1"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.28.3",
Expand Down
93 changes: 47 additions & 46 deletions composer.lock

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

5 changes: 5 additions & 0 deletions src/RuleSet/Php74.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'yield_from',
],
],
'blank_line_between_import_groups' => false,
'braces' => [
'allow_single_line_anonymous_class_with_empty_body' => true,
'allow_single_line_closure' => false,
Expand Down Expand Up @@ -100,9 +101,11 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'constant_case' => [
'case' => 'lower',
],
'control_structure_braces' => false,
'control_structure_continuation_position' => [
'position' => 'same_line',
],
'curly_braces_position' => false,
'date_time_create_from_format_call' => true,
'date_time_immutable' => true,
'declare_equal_normalize' => [
Expand Down Expand Up @@ -357,6 +360,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_nullsafe_operator' => false,
'no_useless_return' => true,
'no_useless_sprintf' => true,
'no_whitespace_before_comma_in_array' => [
Expand Down Expand Up @@ -695,6 +699,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
],
'standardize_increment' => true,
'standardize_not_equals' => true,
'statement_indentation' => false,
'static_lambda' => true,
'strict_comparison' => true,
'strict_param' => true,
Expand Down
5 changes: 5 additions & 0 deletions src/RuleSet/Php80.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'yield_from',
],
],
'blank_line_between_import_groups' => false,
'braces' => [
'allow_single_line_anonymous_class_with_empty_body' => true,
'allow_single_line_closure' => false,
Expand Down Expand Up @@ -100,9 +101,11 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'constant_case' => [
'case' => 'lower',
],
'control_structure_braces' => false,
'control_structure_continuation_position' => [
'position' => 'same_line',
],
'curly_braces_position' => false,
'date_time_create_from_format_call' => true,
'date_time_immutable' => true,
'declare_equal_normalize' => [
Expand Down Expand Up @@ -357,6 +360,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'no_unset_on_property' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_nullsafe_operator' => false,
'no_useless_return' => true,
'no_useless_sprintf' => true,
'no_whitespace_before_comma_in_array' => [
Expand Down Expand Up @@ -695,6 +699,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
],
'standardize_increment' => true,
'standardize_not_equals' => true,
'statement_indentation' => false,
'static_lambda' => true,
'strict_comparison' => true,
'strict_param' => true,
Expand Down
Loading

0 comments on commit 9e64370

Please sign in to comment.