[Php81] Remove usage of AttributeGroupNewLiner on ReadOnlyPropertyRector

rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Fixture/with_attribute_inline.php.inc

@@ -25,8 +25,7 @@ namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
 
 final class WithAttributeInline
 {
-    #[Serializer\Since(Option::SINCE_20211124)]
-    private readonly string $name;
+    #[Serializer\Since(Option::SINCE_20211124)]private readonly string $name;
 
     public function __construct(string $name)
     {

rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Fixture/with_attribute_new_line.php.inc

@@ -0,0 +1,43 @@
+<?php
+
+namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
+
+final class WithAttributeNewLine
+{
+    #[Serializer\Since(Option::SINCE_20211124)]
+    private string $name;
+
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
+
+final class WithAttributeNewLine
+{
+    #[Serializer\Since(Option::SINCE_20211124)]
+    private readonly string $name;
+
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+}
+
+?>

rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Fixture/with_attribute_on_property_promotion_inline.php.inc

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\Php81\Rector\Property\ReadOnlyPropertyRector\Fixture;
+
+final class WithAttributeOnPropertyPromotionInline
+{
+	private function __construct(
+        #[MyAttr]private string $id
+    ){}
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php81\Rector\Property\ReadOnlyPropertyRector\Fixture;
+
+final class WithAttributeOnPropertyPromotionInline
+{
+	private function __construct(
+        #[MyAttr]private readonly string $id
+    ){}
+}
+
+?>

rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Fixture/with_attribute_on_property_promotion.php.inc → rules-tests/Php81/Rector/Property/ReadOnlyPropertyRector/Fixture/with_attribute_on_property_promotion_new_line.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Php81\Rector\Property\ReadOnlyPropertyRector\Fixture;
 
-final class WithAttributeOnPropertyPromotion
+final class WithAttributeOnPropertyPromotionNewLine
 {
 	private function __construct(
         #[MyAttr]
@@ -16,7 +16,7 @@ final class WithAttributeOnPropertyPromotion
 
 namespace Rector\Tests\Php81\Rector\Property\ReadOnlyPropertyRector\Fixture;
 
-final class WithAttributeOnPropertyPromotion
+final class WithAttributeOnPropertyPromotionNewLine
 {
 	private function __construct(
         #[MyAttr]

rules/Php81/NodeManipulator/AttributeGroupNewLiner.php

@@ -4,16 +4,16 @@
 
 namespace Rector\Php81\NodeManipulator;
 
-use PhpParser\Node;
 use PhpParser\Node\AttributeGroup;
+use PhpParser\Node\Stmt\Class_;
 use Rector\ValueObject\Application\File;
 use Webmozart\Assert\Assert;
 
 final class AttributeGroupNewLiner
 {
-    public function newLine(File $file, Node $node): void
+    public function newLine(File $file, Class_ $class): void
     {
-        $attrGroups = $node->attrGroups ?? [];
+        $attrGroups = $class->attrGroups;
 
         if ($attrGroups === []) {
             return;
@@ -23,7 +23,7 @@ public function newLine(File $file, Node $node): void
         Assert::isArray($attrGroups);
 
         $oldTokens = $file->getOldTokens();
-        $startTokenPos = $node->getStartTokenPos();
+        $startTokenPos = $class->getStartTokenPos();
 
         if (! isset($oldTokens[$startTokenPos])) {
             return;

rules/Php81/Rector/Property/ReadOnlyPropertyRector.php

@@ -23,7 +23,6 @@
 use Rector\NodeAnalyzer\ParamAnalyzer;
 use Rector\NodeManipulator\PropertyFetchAssignManipulator;
 use Rector\NodeManipulator\PropertyManipulator;
-use Rector\Php81\NodeManipulator\AttributeGroupNewLiner;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
@@ -47,8 +46,7 @@ public function __construct(
         private readonly VisibilityManipulator $visibilityManipulator,
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
-        private readonly DocBlockUpdater $docBlockUpdater,
-        private readonly AttributeGroupNewLiner $attributeGroupNewLiner
+        private readonly DocBlockUpdater $docBlockUpdater
     ) {
     }
 
@@ -177,12 +175,6 @@ private function refactorProperty(Class_ $class, Property $property, Scope $scop
         }
 
         $this->visibilityManipulator->makeReadonly($property);
-
-        $attributeGroups = $property->attrGroups;
-        if ($attributeGroups !== []) {
-            $this->attributeGroupNewLiner->newLine($this->file, $property);
-        }
-
         $this->removeReadOnlyDoc($property);
 
         return $property;
@@ -244,10 +236,6 @@ private function refactorParam(Class_ $class, ClassMethod $classMethod, Param $p
             return null;
         }
 
-        if ($param->attrGroups !== []) {
-            $this->attributeGroupNewLiner->newLine($this->file, $param);
-        }
-
         $this->visibilityManipulator->makeReadonly($param);
 
         $this->removeReadOnlyDoc($param);