From 922e41ad34b2c33f9322e4a2e83e98e6a0fffe0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 11 Jul 2022 13:25:47 +0200 Subject: [PATCH] Enhancement: Configure phpdoc_order_by_value fixer to include mixin in annotations option --- CHANGELOG.md | 2 ++ src/RuleSet/Php74.php | 1 + src/RuleSet/Php80.php | 1 + src/RuleSet/Php81.php | 1 + test/Unit/RuleSet/Php74Test.php | 1 + test/Unit/RuleSet/Php80Test.php | 1 + test/Unit/RuleSet/Php81Test.php | 1 + 7 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87ad6549..15b04201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ For a full diff see [`4.4.0...main`][4.4.0...main]. - Configured `no_unneeded_control_parentheses` fixer to include `negative_instanceof` and `others` in the `statements` option ([#625]), by [@localheinz] - Configured `trailing_comma_in_multiline` fixer to include `match` in the `elements` option ([#626]), by [@localheinz] - Configured `single_space_after_construct` fixer to include `type_colon` in the `constructs` option ([#627]), by [@localheinz] +- Configured `phpdoc_order_by_value` fixer to include `mixin` in the `annotations` option ([#628]), by [@localheinz] ## [`4.4.0`][4.4.0] @@ -653,6 +654,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#625]: https://github.com/ergebnis/php-cs-fixer-config/pull/625 [#626]: https://github.com/ergebnis/php-cs-fixer-config/pull/626 [#627]: https://github.com/ergebnis/php-cs-fixer-config/pull/627 +[#628]: https://github.com/ergebnis/php-cs-fixer-config/pull/628 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index aad7a677..5311b7cb 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -534,6 +534,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'group', 'internal', 'method', + 'mixin', 'property', 'property-read', 'property-write', diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 8f79cb9c..54d4c62e 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -534,6 +534,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'group', 'internal', 'method', + 'mixin', 'property', 'property-read', 'property-write', diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 122eec6d..a826539c 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -535,6 +535,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'group', 'internal', 'method', + 'mixin', 'property', 'property-read', 'property-write', diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index ae1b9107..134347a0 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -540,6 +540,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'group', 'internal', 'method', + 'mixin', 'property', 'property-read', 'property-write', diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 77b78b75..fcc5d145 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -540,6 +540,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'group', 'internal', 'method', + 'mixin', 'property', 'property-read', 'property-write', diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index d55cbd22..c15c1268 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -541,6 +541,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'group', 'internal', 'method', + 'mixin', 'property', 'property-read', 'property-write',