[Downgradephp80] Better add new line handling with insert \n prefix f…

…or same line attribute
rectorphp · Nov 25, 2024 · 3116c2b · 3116c2b
1 parent 4201862
commit 3116c2b
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php
@@ -119,10 +119,9 @@ public function refactor(Node $node): ?Node
                         (string) $oldTokens[$attrGroup->getEndTokenPos() + 1],
                         "\n"
                     )) {
-                        $print = $this->betterStandardPrinter->print($attrGroup);
-                        $attributesAsComments[] = new Comment($print);
-
-                        unset($attrGroup->attrs[$key]);
+                        // add new line
+                        $oldTokens[$attrGroup->getEndTokenPos() + 1]->text = "\n" . $oldTokens[$attrGroup->getEndTokenPos() + 1]->text;
+                        $this->isDowngraded = true;
                     }
 
                     continue;
@@ -161,12 +160,6 @@ public function refactor(Node $node): ?Node
         // cleanup empty attr groups
         $this->cleanupEmptyAttrGroups($node);
 
-        if ($attributesAsComments !== []) {
-            $this->isDowngraded = true;
-            $currentComments = $node->getAttribute(AttributeKey::COMMENTS) ?? [];
-            $node->setAttribute(AttributeKey::COMMENTS, array_merge($currentComments, $attributesAsComments));
-        }
-
         if (! $this->isDowngraded) {
             return null;
         }