Skip to content

Commit f55bb40

Browse files
committed
[Php81] Remove usage of AttributeGroupNewLiner on ReadOnlyPropertyRector
1 parent e5f4ba5 commit f55bb40

3 files changed

Lines changed: 46 additions & 12 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
2525

2626
final class WithAttributeInline
2727
{
28-
#[Serializer\Since(Option::SINCE_20211124)]
29-
private readonly string $name;
28+
#[Serializer\Since(Option::SINCE_20211124)]private readonly string $name;
3029

3130
public function __construct(string $name)
3231
{
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
4+
5+
final class WithAttributeNewLine
6+
{
7+
#[Serializer\Since(Option::SINCE_20211124)]
8+
private string $name;
9+
10+
public function __construct(string $name)
11+
{
12+
$this->name = $name;
13+
}
14+
15+
public function getName()
16+
{
17+
return $this->name;
18+
}
19+
}
20+
21+
?>
22+
-----
23+
<?php
24+
25+
namespace Rector\Tests\Php82\Rector\Class_\ReadOnlyClassRector\Fixture;
26+
27+
final class WithAttributeNewLine
28+
{
29+
#[Serializer\Since(Option::SINCE_20211124)]
30+
private readonly string $name;
31+
32+
public function __construct(string $name)
33+
{
34+
$this->name = $name;
35+
}
36+
37+
public function getName()
38+
{
39+
return $this->name;
40+
}
41+
}
42+
43+
?>

rules/Php81/Rector/Property/ReadOnlyPropertyRector.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
use Rector\NodeAnalyzer\ParamAnalyzer;
2424
use Rector\NodeManipulator\PropertyFetchAssignManipulator;
2525
use Rector\NodeManipulator\PropertyManipulator;
26-
use Rector\Php81\NodeManipulator\AttributeGroupNewLiner;
2726
use Rector\PhpParser\Node\BetterNodeFinder;
2827
use Rector\PHPStan\ScopeFetcher;
2928
use Rector\Privatization\NodeManipulator\VisibilityManipulator;
@@ -47,8 +46,7 @@ public function __construct(
4746
private readonly VisibilityManipulator $visibilityManipulator,
4847
private readonly BetterNodeFinder $betterNodeFinder,
4948
private readonly PhpDocInfoFactory $phpDocInfoFactory,
50-
private readonly DocBlockUpdater $docBlockUpdater,
51-
private readonly AttributeGroupNewLiner $attributeGroupNewLiner
49+
private readonly DocBlockUpdater $docBlockUpdater
5250
) {
5351
}
5452

@@ -177,12 +175,6 @@ private function refactorProperty(Class_ $class, Property $property, Scope $scop
177175
}
178176

179177
$this->visibilityManipulator->makeReadonly($property);
180-
181-
$attributeGroups = $property->attrGroups;
182-
if ($attributeGroups !== []) {
183-
$this->attributeGroupNewLiner->newLine($this->file, $property);
184-
}
185-
186178
$this->removeReadOnlyDoc($property);
187179

188180
return $property;
@@ -245,7 +237,7 @@ private function refactorParam(Class_ $class, ClassMethod $classMethod, Param $p
245237
}
246238

247239
if ($param->attrGroups !== []) {
248-
$this->attributeGroupNewLiner->newLine($this->file, $param);
240+
//$this->attributeGroupNewLiner->newLine($this->file, $param);
249241
}
250242

251243
$this->visibilityManipulator->makeReadonly($param);

0 commit comments

Comments
 (0)