Drop AttributeKey::SCOPE in CurrentAndParentClassMethodComparator (#3803

)
rectorphp · May 11, 2023 · f4ecf4a · f4ecf4a
1 parent 257395a
commit f4ecf4a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php b/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php
@@ -34,7 +34,7 @@ public function __construct(
     ) {
     }
 
-    public function isParentCallMatching(ClassMethod $classMethod, StaticCall $staticCall): bool
+    public function isParentCallMatching(ClassMethod $classMethod, StaticCall $staticCall, Scope $scope): bool
     {
         if (! $this->isSameMethodParentCall($classMethod, $staticCall)) {
             return false;
@@ -48,7 +48,7 @@ public function isParentCallMatching(ClassMethod $classMethod, StaticCall $stati
             return false;
         }
 
-        return ! $this->isParentClassMethodVisibilityOrDefaultOverride($classMethod, $staticCall);
+        return ! $this->isParentClassMethodVisibilityOrDefaultOverride($classMethod, $staticCall, $scope);
     }
 
     private function isSameMethodParentCall(ClassMethod $classMethod, StaticCall $staticCall): bool
@@ -95,7 +95,8 @@ private function areArgsAndParamsEqual(array $parentStaticCallArgs, array $curre
 
     private function isParentClassMethodVisibilityOrDefaultOverride(
         ClassMethod $classMethod,
-        StaticCall $staticCall
+        StaticCall $staticCall,
+        Scope $scope
     ): bool {
         $classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
         if (! $classReflection instanceof ClassReflection) {
@@ -116,11 +117,11 @@ private function isParentClassMethodVisibilityOrDefaultOverride(
             $nativeParentClassMethodReflection = $nativeParentClassReflection->getMethod($methodName);
 
             if (! $nativeParentClassMethodReflection->isProtected()) {
-                return $this->isOverridingParentParameters($classMethod, $parentClassReflection, $methodName);
+                return $this->isOverridingParentParameters($classMethod, $parentClassReflection, $methodName, $scope);
             }
 
             if (! $nativeParentClassMethodReflection->isPublic()) {
-                return $this->isOverridingParentParameters($classMethod, $parentClassReflection, $methodName);
+                return $this->isOverridingParentParameters($classMethod, $parentClassReflection, $methodName, $scope);
             }
 
             return true;
@@ -132,13 +133,9 @@ private function isParentClassMethodVisibilityOrDefaultOverride(
     private function isOverridingParentParameters(
         ClassMethod $classMethod,
         ClassReflection $classReflection,
-        string $methodName
+        string $methodName,
+        Scope $scope
     ): bool {
-        $scope = $classMethod->getAttribute(AttributeKey::SCOPE);
-        if (! $scope instanceof Scope) {
-            throw new ShouldNotHappenException();
-        }
-
         $extendedMethodReflection = $classReflection->getMethod($methodName, $scope);
 
         // 3rd party code

diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php
@@ -14,7 +14,8 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
-use Rector\Core\Rector\AbstractRector;
+use PHPStan\Analyser\Scope;
+use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\DeadCode\Comparator\CurrentAndParentClassMethodComparator;
 use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -23,7 +24,7 @@
 /**
  * @see \Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector\RemoveDelegatingParentCallRectorTest
  */
-final class RemoveDelegatingParentCallRector extends AbstractRector
+final class RemoveDelegatingParentCallRector extends AbstractScopeAwareRector
 {
     /**
      * @var string[]
@@ -81,7 +82,7 @@ public function getNodeTypes(): array
     /**
      * @param ClassMethod $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
         $classLike = $this->betterNodeFinder->findParentType($node, Class_::class);
         if ($this->shouldSkipClass($classLike)) {
@@ -103,7 +104,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if (! $this->currentAndParentClassMethodComparator->isParentCallMatching($node, $staticCall)) {
+        if (! $this->currentAndParentClassMethodComparator->isParentCallMatching($node, $staticCall, $scope)) {
             return null;
         }