From 73d3bba262ccaf0020c1284c237d98a59ff5fd85 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 17 May 2025 19:03:41 +0700 Subject: [PATCH 1/4] [Annotation] Skip multiple @var on variable definition on RemovePropertyVariableNameDescriptionFixer --- .../Fixture/skip_multiple_var.php.inc | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc diff --git a/tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc b/tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc new file mode 100644 index 00000000..744356bc --- /dev/null +++ b/tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc @@ -0,0 +1,20 @@ + $args + **/ + $args = $firstArgumentValue->getArgs(); + } +} + +?> \ No newline at end of file From ae257f4c89b1987a2543cfb133dc3c80254963a0 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 17 May 2025 19:04:25 +0700 Subject: [PATCH 2/4] Fix --- .../RemovePropertyVariableNameDescriptionFixer.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php b/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php index 2a0f48a4..61e9188c 100644 --- a/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php +++ b/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php @@ -75,6 +75,12 @@ public function fix(SplFileInfo $fileInfo, Tokens $tokens): void // skip if not setter or getter $originalDocContent = $token->getContent(); + preg_match_all(self::VAR_REGEX, $originalDocContent, $matches); + + if (isset($matches[0]) && is_array($matches[0]) && count($matches[0]) !== 1) { + continue; + } + $hasChanged = false; $docblockLines = explode("\n", $originalDocContent); From 03d48d0298a3103985cfcc81f999f9eb49fb616d Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 17 May 2025 19:05:05 +0700 Subject: [PATCH 3/4] eol --- .../Fixture/skip_multiple_var.php.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc b/tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc index 744356bc..51e8afd8 100644 --- a/tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc +++ b/tests/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer/Fixture/skip_multiple_var.php.inc @@ -16,5 +16,3 @@ final class SkipMultipleVar $args = $firstArgumentValue->getArgs(); } } - -?> \ No newline at end of file From 7561fe78c577bdf016986a8c12880135d53a96d3 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 17 May 2025 19:07:06 +0700 Subject: [PATCH 4/4] Fix --- .../Annotation/RemovePropertyVariableNameDescriptionFixer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php b/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php index 61e9188c..f4a9acc5 100644 --- a/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php +++ b/src/Fixer/Annotation/RemovePropertyVariableNameDescriptionFixer.php @@ -77,7 +77,7 @@ public function fix(SplFileInfo $fileInfo, Tokens $tokens): void preg_match_all(self::VAR_REGEX, $originalDocContent, $matches); - if (isset($matches[0]) && is_array($matches[0]) && count($matches[0]) !== 1) { + if (count($matches[0]) !== 1) { continue; }