misc (#2678)

rectorphp · Jul 19, 2022 · c474c67 · c474c67
1 parent 0ffaaca
commit c474c67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/NodeNestingScope/ContextAnalyzer.php b/packages/NodeNestingScope/ContextAnalyzer.php
@@ -72,15 +72,14 @@ public function isInIf(Node $node): bool
         return $previousNode instanceof If_;
     }
 
-    public function isHasAssignWithIndirectReturn(Node $node, If_ $if): bool
+    public function hasAssignWithIndirectReturn(Node $node, If_ $if): bool
     {
         foreach (ControlStructure::LOOP_NODES as $loopNode) {
             $loopObjectType = new ObjectType($loopNode);
             $parentType = $this->nodeTypeResolver->getType($node);
-            $superType = $parentType->isSuperTypeOf($loopObjectType);
-            $isLoopType = $superType->yes();
 
-            if (! $isLoopType) {
+            $superType = $parentType->isSuperTypeOf($loopObjectType);
+            if (! $superType->yes()) {
                 continue;
             }
 

diff --git a/rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeAndIfToEarlyReturnRector.php
@@ -282,6 +282,6 @@ private function isLastIfOrBeforeLastReturn(If_ $if, ?Stmt $nextStmt): bool
             return $this->isLastIfOrBeforeLastReturn($parent, $nextStmt);
         }
 
-        return ! $this->contextAnalyzer->isHasAssignWithIndirectReturn($parent, $if);
+        return ! $this->contextAnalyzer->hasAssignWithIndirectReturn($parent, $if);
     }
 }