Skip to content

Commit

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

composer(deps): Bump friendsofphp/php-cs-fixer from 3.46.0 to 3.48.0
  • Loading branch information
localheinz authored Jan 20, 2024
2 parents 87d3696 + 1e76e2f commit dc8f6ee
Show file tree
Hide file tree
Showing 29 changed files with 124 additions and 8 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 [`6.19.0...main`][6.19.0...main].
### Changed

- Updated `erickskrauch/php-cs-fixer-custom-fixers` ([#984]), by [@dependabot]
- Updated `friendsofphp/php-cs-fixer` ([#993]), by [@dependabot]

## [`6.19.0`][6.19.0]

Expand Down Expand Up @@ -1505,6 +1506,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#978]: https://github.com/ergebnis/php-cs-fixer-config/pull/978
[#979]: https://github.com/ergebnis/php-cs-fixer-config/pull/979
[#984]: https://github.com/ergebnis/php-cs-fixer-config/pull/984
[#993]: https://github.com/ergebnis/php-cs-fixer-config/pull/993

[@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.46.0",
"friendsofphp/php-cs-fixer": "~3.48.0",
"kubawerlos/php-cs-fixer-custom-fixers": "~3.18.0"
},
"require-dev": {
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

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

4 changes: 4 additions & 0 deletions src/RuleSet/Php53.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -315,6 +316,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -459,6 +461,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -559,6 +562,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php54.php
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -316,6 +317,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -460,6 +462,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -560,6 +563,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php55.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -320,6 +321,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -466,6 +468,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -566,6 +569,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php56.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -320,6 +321,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -466,6 +468,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -566,6 +569,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php70.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -320,6 +321,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -464,6 +466,7 @@ public static function create(): RuleSet
'not_operator_with_successor_space' => false,
'nullable_type_declaration' => false,
'nullable_type_declaration_for_default_null_value' => false,
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -564,6 +567,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php71.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -320,6 +321,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -466,6 +468,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -566,6 +569,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php72.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -320,6 +321,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -466,6 +468,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -566,6 +569,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php73.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -320,6 +321,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -466,6 +468,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -566,6 +569,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down
5 changes: 5 additions & 0 deletions src/RuleSet/Php74.php
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ public static function create(): RuleSet
'global_namespace_import' => false,
'group_import' => false,
'header_comment' => false,
'heredoc_closing_marker' => false,
'heredoc_indentation' => false,
'heredoc_to_nowdoc' => true,
'implode_call' => true,
Expand Down Expand Up @@ -320,6 +321,7 @@ public static function create(): RuleSet
'modernize_strpos' => false,
'modernize_types_casting' => true,
'multiline_comment_opening_closing' => true,
'multiline_string_to_heredoc' => false,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
Expand Down Expand Up @@ -466,6 +468,7 @@ public static function create(): RuleSet
'nullable_type_declaration_for_default_null_value' => [
'use_nullable_type_declaration' => true,
],
'numeric_literal_separator' => false,
'object_operator_without_whitespace' => true,
'octal_notation' => false,
'operator_linebreak' => [
Expand Down Expand Up @@ -566,6 +569,7 @@ public static function create(): RuleSet
],
'phpdoc_align' => [
'align' => 'vertical',
'spacing' => 1,
'tags' => [
'method',
'param',
Expand Down Expand Up @@ -707,6 +711,7 @@ public static function create(): RuleSet
'phpdoc_to_param_type' => false,
'phpdoc_to_property_type' => [
'scalar_types' => true,
'union_types' => false,
],
'phpdoc_to_return_type' => false,
'phpdoc_trim' => true,
Expand Down
Loading

0 comments on commit dc8f6ee

Please sign in to comment.