[ScopeNestingComparator] Remove ScopeNestingComparator to remove pare…

…nt lookup (#4316) * [ScopeNestingComparator] Remove ScopeNestingComparator to remove parent lookup * scoped * cs * add back ControlStructure * try remove if check on NullTypeAssignDetector * try rollback ContextNodeVisitor
rectorphp · Jun 22, 2023 · b6650fa · b6650fa
1 parent ffce073
commit b6650fa
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 94 deletions.
diff --git a/packages/NodeNestingScope/ScopeNestingComparator.php b/packages/NodeNestingScope/ScopeNestingComparator.php
diff --git a/rules/TypeDeclaration/AlreadyAssignDetector/NullTypeAssignDetector.php b/rules/TypeDeclaration/AlreadyAssignDetector/NullTypeAssignDetector.php
@@ -9,7 +9,6 @@
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\NodeTraverser;
-use Rector\NodeNestingScope\ScopeNestingComparator;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
 use Rector\PHPStanStaticTypeMapper\DoctrineTypeAnalyzer;
@@ -21,7 +20,6 @@
 final class NullTypeAssignDetector
 {
     public function __construct(
-        private readonly ScopeNestingComparator $scopeNestingComparator,
         private readonly DoctrineTypeAnalyzer $doctrineTypeAnalyzer,
         private readonly NodeTypeResolver $nodeTypeResolver,
         private readonly PropertyAssignMatcher $propertyAssignMatcher,
@@ -42,11 +40,6 @@ public function detect(ClassLike $classLike, string $propertyName): bool
                 return null;
             }
 
-            if ($this->scopeNestingComparator->isNodeConditionallyScoped($expr)) {
-                $needsNullType = true;
-                return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
-            }
-
             // not in doctrine property
             $staticType = $this->nodeTypeResolver->getType($expr);
             if ($this->doctrineTypeAnalyzer->isDoctrineCollectionWithIterableUnionType($staticType)) {