skip method guarded by parent interface contract

Author: TomasVotruba

rules-tests/Php84/Rector/Class_/PropertyHookRector/Fixture/skip_parent_contract.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Php84\Rector\Class_\PropertyHookRector\Fixture;
 
-use Php84\Rector\Class_\PropertyHookRector\Source\SomeParentContractInterface;
+use Rector\Tests\Php84\Rector\Class_\PropertyHookRector\Source\SomeParentContractInterface;
 
 final class SkipParentContract implements SomeParentContractInterface
 {

rules-tests/Php84/Rector/Class_/PropertyHookRector/Source/SomeParentContractInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Php84\Rector\Class_\PropertyHookRector\Source;
+namespace Rector\Tests\Php84\Rector\Class_\PropertyHookRector\Source;
 
 interface SomeParentContractInterface
 {

rules/Php84/Rector/Class_/PropertyHookRector.php

@@ -12,6 +12,7 @@
 use Rector\Php84\NodeFactory\PropertyHookFactory;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\PhpVersionFeature;
+use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -24,6 +25,7 @@ final class PropertyHookRector extends AbstractRector implements MinPhpVersionIn
     public function __construct(
         private readonly SetterGetterFinder $setterGetterFinder,
         private readonly PropertyHookFactory $propertyHookFactory,
+        private readonly ParentClassMethodTypeOverrideGuard $parentClassMethodTypeOverrideGuard
     ) {
     }
 
@@ -95,15 +97,24 @@ public function refactor(Node $node): ?Node
             }
 
             foreach ($candidateClassMethods as $candidateClassMethod) {
-                if (count((array) $candidateClassMethod->stmts) === 1) {
-                    $propertyHook = $this->propertyHookFactory->create($candidateClassMethod, $propertyName);
-                    if (! $propertyHook instanceof PropertyHook) {
-                        continue;
-                    }
-
-                    $property->hooks[] = $propertyHook;
-                    $classMethodsToRemove[] = $candidateClassMethod;
+                if (count((array) $candidateClassMethod->stmts) !== 1) {
+                    continue;
                 }
+
+                // avoid parent contract/method override
+                dump($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($candidateClassMethod));
+
+                if ($this->parentClassMethodTypeOverrideGuard->hasParentClassMethod($candidateClassMethod)) {
+                    continue;
+                }
+
+                $propertyHook = $this->propertyHookFactory->create($candidateClassMethod, $propertyName);
+                if (! $propertyHook instanceof PropertyHook) {
+                    continue;
+                }
+
+                $property->hooks[] = $propertyHook;
+                $classMethodsToRemove[] = $candidateClassMethod;
             }
         }
 

rules/TypeDeclaration/NodeAnalyzer/ClassMethodAndPropertyAnalyzer.php

@@ -58,17 +58,6 @@ public function hasOnlyPropertyAssign(ClassMethod $classMethod, string $property
 
         $assign = $onlyClassMethodStmt->expr;
 
-        //        if (! $assign->expr instanceof Variable) {
-        //            return false;
-        //        }
-
-        //        if (! $this->nodeNameResolver->isName($assign->expr, $propertyName)) {
-        //            return false;
-        //        }
-        //
-        //        dump(33123);
-        //        die;
-
         $assignVar = $assign->var;
         if (! $assignVar instanceof PropertyFetch) {
             return false;