[Core] Apply auto fallback to use Scope from File when Node both does…

…not has parent Node and Scope (#2587) Co-authored-by: GitHub Action <action@github.com>
rectorphp · Jun 29, 2022 · d180768 · d180768
1 parent 1d037d1
commit d180768
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php b/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php
@@ -144,15 +144,13 @@ private function processIdenticalOrNotIdentical(Node $node, FuncCall $funcCall,
         if (($node instanceof Identical || $node instanceof NotIdentical) && $node->right instanceof LNumber && $node->right->value === 0) {
             $this->removeNode($funcCall);
             $node->right = new Array_([]);
-            $node->right->setAttribute(AttributeKey::SCOPE, $node->getAttribute(AttributeKey::SCOPE));
 
             return $expr;
         }
 
         if (($node instanceof Identical || $node instanceof NotIdentical) && $node->left instanceof LNumber && $node->left->value === 0) {
             $this->removeNode($funcCall);
             $node->left = new Array_([]);
-            $node->left->setAttribute(AttributeKey::SCOPE, $node->getAttribute(AttributeKey::SCOPE));
 
             return $expr;
         }

diff --git a/src/NodeAnalyzer/ScopeAnalyzer.php b/src/NodeAnalyzer/ScopeAnalyzer.php
@@ -9,10 +9,8 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Param;
-use PhpParser\Node\Stmt;
-use PhpParser\Node\Stmt\Namespace_;
 use PHPStan\Analyser\MutatingScope;
-use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 
 final class ScopeAnalyzer
 {
@@ -21,11 +19,6 @@ final class ScopeAnalyzer
      */
     private const NO_SCOPE_NODES = [Name::class, Identifier::class, Param::class, Arg::class];
 
-    /**
-     * @var array<class-string<Stmt>>
-     */
-    private const RESOLVABLE_FROM_FILE_NODES = [Namespace_::class, FileWithoutNamespace::class];
-
     public function hasScope(Node $node): bool
     {
         foreach (self::NO_SCOPE_NODES as $noScopeNode) {
@@ -43,6 +36,7 @@ public function isScopeResolvableFromFile(Node $node, ?MutatingScope $mutatingSc
             return false;
         }
 
-        return in_array($node::class, self::RESOLVABLE_FROM_FILE_NODES, true);
+        $parent = $node->getAttribute(AttributeKey::PARENT_NODE);
+        return ! $parent instanceof Node;
     }
 }
diff --git a/src/NodeManipulator/ClassInsertManipulator.php b/src/NodeManipulator/ClassInsertManipulator.php
@@ -14,7 +14,6 @@
 use PHPStan\Type\Type;
 use Rector\Core\PhpParser\Node\NodeFactory;
 use Rector\NodeNameResolver\NodeNameResolver;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PostRector\ValueObject\PropertyMetadata;
 
 final class ClassInsertManipulator
@@ -32,9 +31,6 @@ public function __construct(
 
     public function addAsFirstMethod(Class_ $class, Property | ClassConst | ClassMethod $stmt): void
     {
-        $scope = $class->getAttribute(AttributeKey::SCOPE);
-        $stmt->setAttribute(AttributeKey::SCOPE, $scope);
-
         if ($this->isSuccessToInsertBeforeFirstMethod($class, $stmt)) {
             return;
         }

diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -24,6 +24,7 @@
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\Exclusion\ExclusionManager;
 use Rector\Core\Logging\CurrentRectorProvider;
+use Rector\Core\NodeAnalyzer\ScopeAnalyzer;
 use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
 use Rector\Core\PhpParser\Node\BetterNodeFinder;
@@ -37,6 +38,7 @@
 use Rector\NodeRemoval\NodeRemover;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;
+use Rector\NodeTypeResolver\PHPStan\Scope\ScopeFactory;
 use Rector\PostRector\Collector\NodesToAddCollector;
 use Rector\PostRector\Collector\NodesToRemoveCollector;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -97,6 +99,10 @@ abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorIn
 
     protected ChangedNodeScopeRefresher $changedNodeScopeRefresher;
 
+    protected ScopeAnalyzer $scopeAnalyzer;
+
+    protected ScopeFactory $scopeFactory;
+
     private SimpleCallableNodeTraverser $simpleCallableNodeTraverser;
 
     private ExclusionManager $exclusionManager;
@@ -142,7 +148,9 @@ public function autowire(
         RectifiedAnalyzer $rectifiedAnalyzer,
         CreatedByRuleDecorator $createdByRuleDecorator,
         ChangedNodeScopeRefresher $changedNodeScopeRefresher,
-        RectorOutputStyle $rectorOutputStyle
+        RectorOutputStyle $rectorOutputStyle,
+        ScopeAnalyzer $scopeAnalyzer,
+        ScopeFactory $scopeFactory
     ): void {
         $this->nodesToRemoveCollector = $nodesToRemoveCollector;
         $this->nodesToAddCollector = $nodesToAddCollector;
@@ -165,6 +173,8 @@ public function autowire(
         $this->createdByRuleDecorator = $createdByRuleDecorator;
         $this->changedNodeScopeRefresher = $changedNodeScopeRefresher;
         $this->rectorOutputStyle = $rectorOutputStyle;
+        $this->scopeAnalyzer = $scopeAnalyzer;
+        $this->scopeFactory = $scopeFactory;
     }
 
     /**

diff --git a/src/Rector/AbstractScopeAwareRector.php b/src/Rector/AbstractScopeAwareRector.php
@@ -19,6 +19,14 @@ abstract class AbstractScopeAwareRector extends AbstractRector implements ScopeA
     public function refactor(Node $node)
     {
         $scope = $node->getAttribute(AttributeKey::SCOPE);
+
+        if ($this->scopeAnalyzer->isScopeResolvableFromFile($node, $scope)) {
+            $smartFileInfo = $this->file->getSmartFileInfo();
+            $scope = $this->scopeFactory->createFromFile($smartFileInfo);
+
+            $this->changedNodeScopeRefresher->refresh($node, $scope, $smartFileInfo);
+        }
+
         if (! $scope instanceof Scope) {
             $parent = $node->getAttribute(AttributeKey::PARENT_NODE);