Skip to content

Commit

Permalink
Merge pull request #481 from ergebnis/fix/doctrine
Browse files Browse the repository at this point in the history 
Fix: Add `template` to list of `ignored_tags` option for `doctrine_*` fixers
  • Loading branch information
@localheinz
localheinz committed Aug 30, 2021
2 parents bbfed88 + f2541b5 commit 15de43b
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ For a full diff see [`3.0.2...main`][3.0.2...main].
* Enabled and configured `types_spaces` fixer ([#478]), by [@localheinz]
* Configured `class_attributes_separation` fixer to use newly added `only_if_meta` option for elements `const` and `property` ([#479]), by [@localheinz]
* Configured `class_attributes_separation` fixer to use `none` option for element `trait_import` ([#480]), by [@localheinz]
* Added `template` to `ignored_tags` configuration of `doctrine_*` fixers ([#481]), by [@localheinz]

## [`3.0.2`][3.0.2]

Expand Down Expand Up @@ -475,7 +476,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#477]: https://github.com/ergebnis/php-cs-fixer-config/pull/477
[#478]: https://github.com/ergebnis/php-cs-fixer-config/pull/478
[#479]: https://github.com/ergebnis/php-cs-fixer-config/pull/479
[#480]: https://github.com/ergebnis/php-cs-fixer-config/pull/490
[#480]: https://github.com/ergebnis/php-cs-fixer-config/pull/480
[#481]: https://github.com/ergebnis/php-cs-fixer-config/pull/481

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php73.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -270,6 +271,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -363,6 +365,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -464,6 +467,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php74.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -270,6 +271,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -363,6 +365,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -464,6 +467,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down
4 changes: 4 additions & 0 deletions src/RuleSet/Php80.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -270,6 +271,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -363,6 +365,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -464,6 +467,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down
4 changes: 4 additions & 0 deletions test/Unit/RuleSet/Php73Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ final class Php73Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -276,6 +277,7 @@ final class Php73Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -369,6 +371,7 @@ final class Php73Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -470,6 +473,7 @@ final class Php73Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down
4 changes: 4 additions & 0 deletions test/Unit/RuleSet/Php74Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ final class Php74Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -276,6 +277,7 @@ final class Php74Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -369,6 +371,7 @@ final class Php74Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -470,6 +473,7 @@ final class Php74Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down
4 changes: 4 additions & 0 deletions test/Unit/RuleSet/Php80Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ final class Php80Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -276,6 +277,7 @@ final class Php80Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -369,6 +371,7 @@ final class Php80Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down Expand Up @@ -470,6 +473,7 @@ final class Php80Test extends ExplicitRuleSetTestCase
'staticVar',
'subpackage',
'SuppressWarnings',
'template',
'test',
'testdox',
'throw',
Expand Down

0 comments on commit 15de43b

Please sign in to comment.