Skip to content

Commit

Permalink
Merge pull request #286 from ergebnis/feature/phpdoc-inline-tag-norma…
Browse files Browse the repository at this point in the history
…lizer

Enhancement: Enable and configure phpdoc_inline_tag_normalizer fixer
  • Loading branch information
ergebnis-bot authored Dec 8, 2020
2 parents 1af89ef + b7b4874 commit 6599f4f
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ For a full diff see [`2.6.1...main`][2.6.1...main].
* Enabled `no_trailing_whitespace_in_string` fixer ([#283]), by [@localheinz]
* Enabled `no_useless_sprintf` fixer ([#284]), by [@localheinz]
* Enabled and configured `operator_linebreak` fixer ([#285]), by [@localheinz]
* Enabled and configured `phpdoc_inline_tag_normalizer` fixer ([#286]), by [@localheinz]

## [`2.6.1`][2.6.1]

Expand Down Expand Up @@ -239,6 +240,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
[#283]: https://github.com/ergebnis/php-cs-fixer-config/pull/283
[#284]: https://github.com/ergebnis/php-cs-fixer-config/pull/284
[#285]: https://github.com/ergebnis/php-cs-fixer-config/pull/285
[#286]: https://github.com/ergebnis/php-cs-fixer-config/pull/286

[@dependabot]: https://github.com/apps/dependabot
[@linuxjuggler]: https://github.com/linuxjuggler
Expand Down
14 changes: 13 additions & 1 deletion src/RuleSet/Php71.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,19 @@ final class Php71 extends AbstractRuleSet
'phpdoc_align' => true,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => false,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
'example',
'id',
'inheritdoc',
'inheritdocs',
'internal',
'link',
'source',
'toc',
'tutorial',
],
],
'phpdoc_line_span' => [
'const' => 'multi',
'method' => 'multi',
Expand Down
14 changes: 13 additions & 1 deletion src/RuleSet/Php73.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,19 @@ final class Php73 extends AbstractRuleSet
'phpdoc_align' => true,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => false,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
'example',
'id',
'inheritdoc',
'inheritdocs',
'internal',
'link',
'source',
'toc',
'tutorial',
],
],
'phpdoc_line_span' => [
'const' => 'multi',
'method' => 'multi',
Expand Down
14 changes: 13 additions & 1 deletion src/RuleSet/Php74.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,19 @@ final class Php74 extends AbstractRuleSet
'phpdoc_align' => true,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => false,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
'example',
'id',
'inheritdoc',
'inheritdocs',
'internal',
'link',
'source',
'toc',
'tutorial',
],
],
'phpdoc_line_span' => [
'const' => 'multi',
'method' => 'multi',
Expand Down
14 changes: 13 additions & 1 deletion test/Unit/RuleSet/Php71Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,19 @@ final class Php71Test extends AbstractRuleSetTestCase
'phpdoc_align' => true,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => false,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
'example',
'id',
'inheritdoc',
'inheritdocs',
'internal',
'link',
'source',
'toc',
'tutorial',
],
],
'phpdoc_line_span' => [
'const' => 'multi',
'method' => 'multi',
Expand Down
14 changes: 13 additions & 1 deletion test/Unit/RuleSet/Php73Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,19 @@ final class Php73Test extends AbstractRuleSetTestCase
'phpdoc_align' => true,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => false,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
'example',
'id',
'inheritdoc',
'inheritdocs',
'internal',
'link',
'source',
'toc',
'tutorial',
],
],
'phpdoc_line_span' => [
'const' => 'multi',
'method' => 'multi',
Expand Down
14 changes: 13 additions & 1 deletion test/Unit/RuleSet/Php74Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,19 @@ final class Php74Test extends AbstractRuleSetTestCase
'phpdoc_align' => true,
'phpdoc_annotation_without_dot' => true,
'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => false,
'phpdoc_inline_tag_normalizer' => [
'tags' => [
'example',
'id',
'inheritdoc',
'inheritdocs',
'internal',
'link',
'source',
'toc',
'tutorial',
],
],
'phpdoc_line_span' => [
'const' => 'multi',
'method' => 'multi',
Expand Down

0 comments on commit 6599f4f

Please sign in to comment.