[Privatization] Remove final flag on Privatize*Rector

Author: samsonasik

rules-tests/Privatization/NodeManipulator/VisibilityManipulatorTest.php

@@ -7,6 +7,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
 use Rector\Testing\PHPUnit\AbstractLazyTestCase;
+use Rector\ValueObject\MethodName;
 use Rector\ValueObject\Visibility;
 
 final class VisibilityManipulatorTest extends AbstractLazyTestCase
@@ -21,4 +22,26 @@ public function test(): void
         $visibilityManipulator->changeNodeVisibility($classMethod, Visibility::PROTECTED);
         $this->assertSame(Visibility::PROTECTED | Visibility::STATIC, $classMethod->flags);
     }
+
+    public function testMakePrivateRemovesFinal(): void
+    {
+        $visibilityManipulator = $this->make(VisibilityManipulator::class);
+
+        $classMethod = new ClassMethod('run');
+        $classMethod->flags = Visibility::PROTECTED | Visibility::FINAL;
+
+        $visibilityManipulator->makePrivate($classMethod);
+        $this->assertSame(Visibility::PRIVATE, $classMethod->flags);
+    }
+
+    public function testMakePrivateKeepsFinalOnConstructor(): void
+    {
+        $visibilityManipulator = $this->make(VisibilityManipulator::class);
+
+        $classMethod = new ClassMethod(MethodName::CONSTRUCT);
+        $classMethod->flags = Visibility::PROTECTED | Visibility::FINAL;
+
+        $visibilityManipulator->makePrivate($classMethod);
+        $this->assertSame(Visibility::PRIVATE | Visibility::FINAL, $classMethod->flags);
+    }
 }

rules-tests/Privatization/Rector/ClassConst/PrivatizeFinalClassConstantRector/Fixture/remove_final_modifier.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\Privatization\Rector\ClassConst\PrivatizeFinalClassConstantRector\Fixture;
+
+final class RemoveFinalModifier
+{
+    final protected const VALUE = 'value';
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Privatization\Rector\ClassConst\PrivatizeFinalClassConstantRector\Fixture;
+
+final class RemoveFinalModifier
+{
+    private const VALUE = 'value';
+}
+
+?>

rules-tests/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector/Fixture/remove_final_modifier.php.inc

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector\Fixture;
+
+final class RemoveFinalModifier
+{
+    final protected function run()
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector\Fixture;
+
+final class RemoveFinalModifier
+{
+    private function run()
+    {
+    }
+}
+
+?>

rules-tests/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector/Fixture/remove_final_modifier.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector\Fixture;
+
+final class RemoveFinalModifier
+{
+    protected final $x = true;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector\Fixture;
+
+final class RemoveFinalModifier
+{
+    private $x = true;
+}
+
+?>

rules-tests/Privatization/Rector/Property/PrivatizeFinalClassPropertyRector/Fixture/remove_final_modifier_promoted_property.php.inc

@@ -0,0 +1,25 @@
+<?php
+
+namespace Rector\Tests\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector\Fixture;
+
+final class RemoveFinalModifierPromotedProperty
+{
+    public function __construct(protected final $value)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector\Fixture;
+
+final class RemoveFinalModifierPromotedProperty
+{
+    public function __construct(private $value)
+    {
+    }
+}
+
+?>

rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php

@@ -127,7 +127,7 @@ private function refactorTraitUse(TraitUse $traitUse): ?array
         }
 
         $traitNames = array_map(
-            static fn (Name $trait): string => $trait->toString(),
+            static fn (Name $name): string => $name->toString(),
             $traitUse->traits
         );
 

rules/Privatization/NodeManipulator/VisibilityManipulator.php

@@ -10,14 +10,21 @@
 use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
+use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\ValueObject\MethodName;
 use Rector\ValueObject\Visibility;
 use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Tests\Privatization\NodeManipulator\VisibilityManipulatorTest
  */
-final class VisibilityManipulator
+final readonly class VisibilityManipulator
 {
+    public function __construct(
+        private NodeNameResolver $nodeNameResolver
+    ) {
+    }
+
     public function hasVisibility(Class_|ClassMethod|Property|ClassConst|Param $node, int $visibility): bool
     {
         return (bool) ($node->flags & $visibility);
@@ -105,6 +112,13 @@ public function makeProtected(ClassMethod|Property|ClassConst $node): void
     public function makePrivate(ClassMethod|Property|ClassConst|Param $node): void
     {
         $this->replaceVisibilityFlag($node, Visibility::PRIVATE);
+
+        // only constructor can be both private and final
+        if ($node instanceof ClassMethod && $this->nodeNameResolver->isName($node, MethodName::CONSTRUCT)) {
+            return;
+        }
+
+        $node->flags &= ~Modifiers::FINAL;
     }
 
     /**