From 21fa9ea06d05b4a4a787dac8249b7e22939b5bb2 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 18 Jul 2024 19:54:40 +0200 Subject: [PATCH 1/2] add fixture with trait --- .../Fixture/trait_docblock.php.inc | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc diff --git a/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc b/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc new file mode 100644 index 00000000..0ffd11bb --- /dev/null +++ b/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc @@ -0,0 +1,22 @@ + +----- + From 8a03672cb1a39ae4735415ad300e7514a68a70c4 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 18 Jul 2024 19:55:41 +0200 Subject: [PATCH 2/2] add trait support --- src/DocBlock/UselessDocBlockCleaner.php | 4 ++-- .../Fixture/trait_docblock.php.inc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/DocBlock/UselessDocBlockCleaner.php b/src/DocBlock/UselessDocBlockCleaner.php index d07279fd..95d5dcb1 100644 --- a/src/DocBlock/UselessDocBlockCleaner.php +++ b/src/DocBlock/UselessDocBlockCleaner.php @@ -47,13 +47,13 @@ final class UselessDocBlockCleaner * @see https://regex101.com/r/RzTdFH/4 * @var string */ - private const STANDALONE_COMMENT_CLASS_REGEX = '#\/\/\s+[cC]lass\s+\w+$#'; + private const STANDALONE_COMMENT_CLASS_REGEX = '#\/\/\s+([cC]lass|[tT]rait)\s+\w+$#'; /** * @see https://regex101.com/r/RzTdFH/4 * @var string */ - private const INLINE_COMMENT_CLASS_REGEX = '#( \*|\/\/)\s+[cC]lass\s+(\w+)\n#'; + private const INLINE_COMMENT_CLASS_REGEX = '#( \*|\/\/)\s+([cC]lass|[tT]rait)\s+(\w+)\n#'; /** * @see https://regex101.com/r/bzbxXz/2 diff --git a/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc b/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc index 0ffd11bb..1eff079c 100644 --- a/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc +++ b/tests/Fixer/Commenting/RemoveUselessDefaultCommentFixer/Fixture/trait_docblock.php.inc @@ -15,6 +15,8 @@ trait SomeTrait namespace Symplify\CodingStandard\Tests\Fixer\Commenting\RemoveUselessDefaultCommentFixer\Fixture; +/** + */ trait SomeTrait { }