[Privatization] Skip method with parent call (#5283)

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

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector\Fixture;
+
+use Rector\Tests\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector\Source\SomeParentClass;
+
+final class SkipWithParentCall extends SomeParentClass
+{
+    protected function someMethod()
+    {
+        parent::someMethod();
+    }
+}

rules-tests/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector/Source/SomeParentClass.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Rector\Tests\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector\Source;
+
+class SomeParentClass
+{
+
+}

rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php

@@ -5,10 +5,12 @@
 namespace Rector\Privatization\Rector\ClassMethod;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
+use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Privatization\Guard\OverrideByParentClassGuard;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
@@ -24,7 +26,8 @@ final class PrivatizeFinalClassMethodRector extends AbstractScopeAwareRector
     public function __construct(
         private readonly ClassMethodVisibilityGuard $classMethodVisibilityGuard,
         private readonly VisibilityManipulator $visibilityManipulator,
-        private readonly OverrideByParentClassGuard $overrideByParentClassGuard
+        private readonly OverrideByParentClassGuard $overrideByParentClassGuard,
+        private readonly BetterNodeFinder $betterNodeFinder,
     ) {
     }
 
@@ -123,6 +126,22 @@ private function shouldSkipClassMethod(ClassMethod $classMethod): bool
             return true;
         }
 
-        return ! $classMethod->isProtected();
+        if (! $classMethod->isProtected()) {
+            return true;
+        }
+
+        // if has parent call, its probably overriding parent one → skip it
+        $hasParentCall = (bool) $this->betterNodeFinder->findFirst(
+            (array) $classMethod->stmts,
+            function (Node $node): bool {
+                if (! $node instanceof StaticCall) {
+                    return false;
+                }
+
+                return $this->isName($node->class, 'parent');
+            }
+        );
+
+        return $hasParentCall;
     }
 }

tests/Issues/FqcnAnnotationToAttribute/config/configured_rule.php

@@ -3,12 +3,9 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Symfony\Set\SymfonySetList;
 use Rector\Doctrine\Set\DoctrineSetList;
+use Rector\Symfony\Set\SymfonySetList;
 
 return static function (RectorConfig $rectorConfig): void {
-        $rectorConfig->sets([
-            SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES,
-            DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
-    ]);
+    $rectorConfig->sets([SymfonySetList::ANNOTATIONS_TO_ATTRIBUTES, DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES]);
 };