Skip to content

Commit

Permalink
[Php81] Skip non private modifier on ReadOnlyPropertyRector (#1367)
Browse files Browse the repository at this point in the history
* [Php81] Skip non private vmodifier on ReadOnlyPropertyRector

* [ci-review] Rector Rectify

* [ci-review] Rector Rectify

Co-authored-by: GitHub Action <action@github.com>
  • Loading branch information
samsonasik and actions-user committed Dec 2, 2021
1 parent 3f07f38 commit 922e91d
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

namespace Rector\Tests\Php81\Rector\Property\ReadOnlyPropertyRector\Fixture;

final class SkipNonPrivateProperty
{
public string $name;

public function __construct(string $name)
{
$this->name = $name;
}

public function getName()
{
return $this->name;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

namespace Rector\Tests\Php81\Rector\Property\ReadOnlyPropertyRector\Fixture;

class SkipNonPrivateProperty2
{
public function __construct(
public string $name
) {
}

public function getName()
{
return $this->name;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ protected function setUp(): void

public function test(): void
{
$node = new ClassMethod('SomeClass');
$node->flags = Visibility::PUBLIC | Visibility::STATIC;
$this->visibilityManipulator->changeNodeVisibility($node, Visibility::PROTECTED);
$this->assertSame(Visibility::PROTECTED | Visibility::STATIC, $node->flags);
$classMethod = new ClassMethod('SomeClass');
$classMethod->flags = Visibility::PUBLIC | Visibility::STATIC;
$this->visibilityManipulator->changeNodeVisibility($classMethod, Visibility::PROTECTED);
$this->assertSame(Visibility::PROTECTED | Visibility::STATIC, $classMethod->flags);
}
}
7 changes: 6 additions & 1 deletion rules/Php81/Rector/Property/ReadOnlyPropertyRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Rector\Core\NodeManipulator\PropertyManipulator;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\Core\ValueObject\Visibility;
use Rector\Privatization\NodeManipulator\VisibilityManipulator;
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
Expand Down Expand Up @@ -101,6 +102,10 @@ public function refactor(Node $node): ?Node
return null;
}

if ($node->flags !== Visibility::PRIVATE) {
return null;
}

$this->visibilityManipulator->makeReadonly($node);
return $node;
}
Expand All @@ -112,7 +117,7 @@ public function provideMinPhpVersion(): int

private function refactorParam(Param $param): Param | null
{
if ($param->flags === 0) {
if ($param->flags !== Visibility::PRIVATE) {
return null;
}

Expand Down
3 changes: 3 additions & 0 deletions rules/Privatization/NodeManipulator/VisibilityManipulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
use Rector\Core\ValueObject\Visibility;
use Webmozart\Assert\Assert;

/**
* @see \Rector\Tests\Privatization\NodeManipulator\VisibilityManipulatorTest
*/
final class VisibilityManipulator
{
public function hasVisibility(ClassMethod | Property | ClassConst | Param $node, int $visibility): bool
Expand Down

0 comments on commit 922e91d

Please sign in to comment.