Drop AttributeKey::SCOPE in FuncCallStaticCallToMethodCallAnalyzer (#…

…3807)
rectorphp · May 11, 2023 · 18af399 · 18af399
1 parent dd970ac
commit 18af399
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/rules/Transform/NodeAnalyzer/FuncCallStaticCallToMethodCallAnalyzer.php b/rules/Transform/NodeAnalyzer/FuncCallStaticCallToMethodCallAnalyzer.php
@@ -11,6 +11,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
+use PHPStan\Analyser\Scope;
 use PHPStan\Type\ObjectType;
 use Rector\Core\PhpParser\Node\NodeFactory;
 use Rector\Naming\Naming\PropertyNaming;
@@ -35,12 +36,14 @@ public function __construct(
     public function matchTypeProvidingExpr(
         Class_ $class,
         ClassMethod $classMethod,
-        ObjectType $objectType
+        ObjectType $objectType,
+        Scope $scope
     ): MethodCall | PropertyFetch | Variable {
         $expr = $this->typeProvidingExprFromClassResolver->resolveTypeProvidingExprFromClass(
             $class,
             $classMethod,
-            $objectType
+            $objectType,
+            $scope
         );
 
         if ($expr instanceof Expr) {

diff --git a/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php b/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php
@@ -41,7 +41,8 @@ public function __construct(
     public function resolveTypeProvidingExprFromClass(
         Class_ $class,
         ClassMethod $classMethod,
-        ObjectType $objectType
+        ObjectType $objectType,
+        Scope $scope
     ): ?Expr {
         $className = (string) $this->nodeNameResolver->getName($class);
 
@@ -53,11 +54,6 @@ public function resolveTypeProvidingExprFromClass(
         }
 
         // B. match existing property
-        $scope = $class->getAttribute(AttributeKey::SCOPE);
-        if (! $scope instanceof Scope) {
-            return null;
-        }
-
         $propertyFetch = $this->resolvePropertyFetchProvidingType($classReflection, $scope, $objectType);
         if ($propertyFetch instanceof PropertyFetch) {
             return $propertyFetch;

diff --git a/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php b/rules/Transform/Rector/FuncCall/FuncCallToMethodCallRector.php
@@ -8,8 +8,10 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Analyser\Scope;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Transform\NodeAnalyzer\FuncCallStaticCallToMethodCallAnalyzer;
 use Rector\Transform\ValueObject\FuncCallToMethodCall;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@@ -19,7 +21,7 @@
 /**
  * @see \Rector\Tests\Transform\Rector\FuncCall\FuncCallToMethodCallRector\FuncCallToMethodCallRectorTest
  */
-final class FuncCallToMethodCallRector extends AbstractRector implements ConfigurableRectorInterface
+final class FuncCallToMethodCallRector extends AbstractScopeAwareRector implements ConfigurableRectorInterface
 {
     /**
      * @var FuncCallToMethodCall[]
@@ -81,7 +83,7 @@ public function getNodeTypes(): array
     /**
      * @param FuncCall $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
         $classLike = $this->betterNodeFinder->findParentType($node, Class_::class);
         if (! $classLike instanceof Class_) {
@@ -105,7 +107,8 @@ public function refactor(Node $node): ?Node
             $expr = $this->funcCallStaticCallToMethodCallAnalyzer->matchTypeProvidingExpr(
                 $classLike,
                 $classMethod,
-                $funcNameToMethodCallName->getNewObjectType()
+                $funcNameToMethodCallName->getNewObjectType(),
+                $scope
             );
 
             return $this->nodeFactory->createMethodCall(

diff --git a/rules/Transform/Rector/StaticCall/StaticCallToMethodCallRector.php b/rules/Transform/Rector/StaticCall/StaticCallToMethodCallRector.php
@@ -11,9 +11,11 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Analyser\Scope;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\Rector\AbstractRector;
+use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Transform\NodeAnalyzer\FuncCallStaticCallToMethodCallAnalyzer;
 use Rector\Transform\ValueObject\StaticCallToMethodCall;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@@ -23,7 +25,7 @@
 /**
  * @see \Rector\Tests\Transform\Rector\StaticCall\StaticCallToMethodCallRector\StaticCallToMethodCallRectorTest
  */
-final class StaticCallToMethodCallRector extends AbstractRector implements ConfigurableRectorInterface
+final class StaticCallToMethodCallRector extends AbstractScopeAwareRector implements ConfigurableRectorInterface
 {
     /**
      * @var StaticCallToMethodCall[]
@@ -96,7 +98,7 @@ public function getNodeTypes(): array
     /**
      * @param StaticCall $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
         $classLike = $this->betterNodeFinder->findParentType($node, Class_::class);
         if (! $classLike instanceof Class_) {
@@ -120,7 +122,8 @@ public function refactor(Node $node): ?Node
             $expr = $this->funcCallStaticCallToMethodCallAnalyzer->matchTypeProvidingExpr(
                 $classLike,
                 $classMethod,
-                $staticCallToMethodCall->getClassObjectType()
+                $staticCallToMethodCall->getClassObjectType(),
+                $scope
             );
 
             if ($staticCallToMethodCall->getMethodName() === '*') {