handle FiberScope

Author: samsonasik

rules/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector.php

@@ -107,7 +107,7 @@ private function isAllowedVariable(Variable $variable): bool
 
     private function isAllowedExpr(Expr $expr, Scope $scope): bool
     {
-        if (! ScopeTypeHelper::getType($scope, $expr)->isArray()->yes()) {
+        if (! $scope->getType($scope, $expr)->isArray()->yes()) {
             return false;
         }
 

rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php

@@ -121,7 +121,7 @@ public function refactor(Node $node): int|null|array|If_
         }
 
         $scope = ScopeFetcher::fetch($node);
-        $type = ScopeTypeHelper::getNativeType($scope, $node->cond);
+        $type = $scope->getNativeType($scope, $node->cond);
         if (! $type->isTrue()->yes()) {
             return null;
         }

rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php

@@ -123,7 +123,7 @@ private function isUselessBeforeForeachCheck(If_ $if, Scope $scope): bool
         if (($ifCond instanceof Variable || $this->propertyFetchAnalyzer->isPropertyFetch($ifCond))
             && $this->nodeComparator->areNodesEqual($ifCond, $foreachExpr)
         ) {
-            $ifType = ScopeTypeHelper::getNativeType($scope, $ifCond);
+            $ifType = $scope->getNativeType($scope, $ifCond);
             return $ifType->isArray()
                 ->yes();
         }
@@ -193,7 +193,7 @@ private function refactorStmtsAware(Node $stmtsAware): ?Node
                 continue;
             }
 
-            $ifType = ScopeTypeHelper::getNativeType($scope, $empty->expr);
+            $ifType = $scope->getNativeType($scope, $empty->expr);
             if (! $ifType->isArray()->yes()) {
                 continue;
             }
@@ -239,7 +239,7 @@ private function shouldSkipForeachExpr(Expr $foreachExpr, Scope $scope): bool
                 return true;
             }
 
-            $ifType = ScopeTypeHelper::getNativeType($scope, $foreachExpr);
+            $ifType = $scope->getNativeType($scope, $foreachExpr);
             if (! $ifType->isArray()->yes()) {
                 return true;
             }

rules/DeadCode/UselessIfCondBeforeForeachDetector.php

@@ -126,7 +126,7 @@ private function areCondExprAndForeachExprSame(Empty_ $empty, Expr $foreachExpr,
         }
 
         // is array though?
-        $arrayType = ScopeTypeHelper::getType($scope, $empty->expr);
+        $arrayType = $scope->getType($scope, $empty->expr);
         return $arrayType->isArray()
             ->yes();
     }

rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php

@@ -107,7 +107,7 @@ private function refactorBooleanNot(BooleanNot $booleanNot, Scope $scope): Expr|
             return null;
         }
 
-        $emptyExprType = ScopeTypeHelper::getNativeType($scope, $empty->expr);
+        $emptyExprType = $scope->getNativeType($scope, $empty->expr);
 
         $result = $this->exactCompareFactory->createNotIdenticalFalsyCompare(
             $emptyExprType,
@@ -132,7 +132,7 @@ private function refactorEmpty(Empty_ $empty, Scope $scope, bool $treatAsNonEmpt
             return null;
         }
 
-        $exprType = ScopeTypeHelper::getNativeType($scope, $empty->expr);
+        $exprType = $scope->getNativeType($scope, $empty->expr);
         $result = $this->exactCompareFactory->createIdenticalFalsyCompare($exprType, $empty->expr, $treatAsNonEmpty);
         if (! $result instanceof Expr) {
             return null;