Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

composer(deps): bump friendsofphp/php-cs-fixer from 3.10.0 to 3.11.0 #651

Merged
merged 5 commits into from
Sep 2, 2022
Merged

composer(deps): bump friendsofphp/php-cs-fixer from 3.10.0 to 3.11.0 #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dbd3233
composer(deps): bump friendsofphp/php-cs-fixer from 3.10.0 to 3.11.0
dependabot[bot] Sep 2, 2022
efa0035
Fix: Update CHANGELOG.md
localheinz Sep 2, 2022
4bde5b4
Fix: Configure no_trailing_comma_in_singleline instead of deprecated …
localheinz Sep 2, 2022
049331c
Fix: Configure phpdoc_separation fixer
localheinz Sep 2, 2022
f10f0cb
Fix: Update CHANGELOG.md
localheinz Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

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

## [`4.8.0`][4.8.0]

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

### Changed

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

## [`4.7.0`][4.7.0]

Expand Down Expand Up @@ -546,6 +554,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[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
[4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.8.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 @@ -593,7 +602,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[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...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
[4.7.0...4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.0...4.8.0
[4.8.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.8.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 @@ -732,6 +742,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#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
[#651]: https://github.com/ergebnis/php-cs-fixer-config/pull/651

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
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.10.0"
"friendsofphp/php-cs-fixer": "~3.11.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.28.3",
Expand Down
26 changes: 13 additions & 13 deletions composer.lock
View file
Open in desktop

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

36 changes: 32 additions & 4 deletions src/RuleSet/Php74.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,13 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'allow_unused_params' => false,
'remove_inheritdoc' => false,
],
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_comma_in_singleline_function_call' => true,
'no_trailing_comma_in_singleline' => [
'elements' => [
'arguments',
'array',
'array_destructuring',
],
],
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_trailing_whitespace_in_string' => true,
Expand Down Expand Up @@ -575,7 +579,31 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'str',
],
],
'phpdoc_separation' => true,
'phpdoc_separation' => [
'groups' => [
[
'deprecated',
'link',
'see',
'since',
],
[
'author',
'copyright',
'license',
],
[
'category',
'package',
'subpackage',
],
[
'property',
'property-read',
'property-write',
],
],
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_tag_casing' => [
Expand Down
36 changes: 32 additions & 4 deletions src/RuleSet/Php80.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,13 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'allow_unused_params' => false,
'remove_inheritdoc' => false,
],
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_comma_in_singleline_function_call' => true,
'no_trailing_comma_in_singleline' => [
'elements' => [
'arguments',
'array',
'array_destructuring',
],
],
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_trailing_whitespace_in_string' => true,
Expand Down Expand Up @@ -576,7 +580,31 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'str',
],
],
'phpdoc_separation' => true,
'phpdoc_separation' => [
'groups' => [
[
'deprecated',
'link',
'see',
'since',
],
[
'author',
'copyright',
'license',
],
[
'category',
'package',
'subpackage',
],
[
'property',
'property-read',
'property-write',
],
],
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_tag_casing' => [
Expand Down
36 changes: 32 additions & 4 deletions src/RuleSet/Php81.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,13 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
'allow_unused_params' => false,
'remove_inheritdoc' => false,
],
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_comma_in_singleline_function_call' => true,
'no_trailing_comma_in_singleline' => [
'elements' => [
'arguments',
'array',
'array_destructuring',
],
],
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_trailing_whitespace_in_string' => true,
Expand Down Expand Up @@ -577,7 +581,31 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet
'str',
],
],
'phpdoc_separation' => true,
'phpdoc_separation' => [
'groups' => [
[
'deprecated',
'link',
'see',
'since',
],
[
'author',
'copyright',
'license',
],
[
'category',
'package',
'subpackage',
],
[
'property',
'property-read',
'property-write',
],
],
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_tag_casing' => [
Expand Down
36 changes: 32 additions & 4 deletions test/Unit/RuleSet/Php74Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,13 @@ final class Php74Test extends ExplicitRuleSetTestCase
'allow_unused_params' => false,
'remove_inheritdoc' => false,
],
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_comma_in_singleline_function_call' => true,
'no_trailing_comma_in_singleline' => [
'elements' => [
'arguments',
'array',
'array_destructuring',
],
],
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_trailing_whitespace_in_string' => true,
Expand Down Expand Up @@ -581,7 +585,31 @@ final class Php74Test extends ExplicitRuleSetTestCase
'str',
],
],
'phpdoc_separation' => true,
'phpdoc_separation' => [
'groups' => [
[
'deprecated',
'link',
'see',
'since',
],
[
'author',
'copyright',
'license',
],
[
'category',
'package',
'subpackage',
],
[
'property',
'property-read',
'property-write',
],
],
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_tag_casing' => [
Expand Down
36 changes: 32 additions & 4 deletions test/Unit/RuleSet/Php80Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,13 @@ final class Php80Test extends ExplicitRuleSetTestCase
'allow_unused_params' => false,
'remove_inheritdoc' => false,
],
'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_comma_in_singleline_function_call' => true,
'no_trailing_comma_in_singleline' => [
'elements' => [
'arguments',
'array',
'array_destructuring',
],
],
'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true,
'no_trailing_whitespace_in_string' => true,
Expand Down Expand Up @@ -582,7 +586,31 @@ final class Php80Test extends ExplicitRuleSetTestCase
'str',
],
],
'phpdoc_separation' => true,
'phpdoc_separation' => [
'groups' => [
[
'deprecated',
'link',
'see',
'since',
],
[
'author',
'copyright',
'license',
],
[
'category',
'package',
'subpackage',
],
[
'property',
'property-read',
'property-write',
],
],
],
'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => true,
'phpdoc_tag_casing' => [
Expand Down
Loading