Utilize Type->isArray() (#3065)

Co-authored-by: Markus Staab <m.staab@complex-it.de>
rectorphp · Nov 15, 2022 · 04257d3 · 04257d3
1 parent e78e472
commit 04257d3
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 23 deletions.
diff --git a/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php b/rules/CodeQuality/Rector/Foreach_/ForeachItemsAssignToEmptyArrayToAssignRector.php
@@ -116,7 +116,7 @@ private function shouldSkip(Foreach_ $foreach, Scope $scope): bool
         }
 
         $type = $scope->getType($foreach->expr);
-        return ! $type instanceof ArrayType;
+        return ! $type->isArray()->yes();
     }
 
     private function shouldSkipAsPartOfOtherLoop(Foreach_ $foreach): bool

diff --git a/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php b/rules/CodeQuality/Rector/If_/ExplicitBoolCompareRector.php
@@ -171,7 +171,7 @@ private function resolveNewConditionNode(Expr $expr, bool $isNegated): ?BinaryOp
     private function resolveCount(bool $isNegated, FuncCall $funcCall): Identical | Greater | null
     {
         $countedType = $this->getType($funcCall->args[0]->value);
-        if ($countedType instanceof ArrayType) {
+        if ($countedType->isArray()->yes()) {
             return null;
         }
 

diff --git a/rules/CodeQuality/Rector/Ternary/TernaryEmptyArrayArrayDimFetchToCoalesceRector.php b/rules/CodeQuality/Rector/Ternary/TernaryEmptyArrayArrayDimFetchToCoalesceRector.php
@@ -75,7 +75,7 @@ public function refactor(Node $node): ?Node
         }
 
         $emptyExprType = $this->getType($negagedExpr->expr);
-        if (! $emptyExprType instanceof ArrayType) {
+        if (! $emptyExprType->isArray()->yes()) {
             return null;
         }
 

diff --git a/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php b/rules/CodingStyle/Rector/FuncCall/CountArrayToEmptyArrayComparisonRector.php
@@ -136,7 +136,7 @@ private function processMarkTruthyNegation(BooleanNot $booleanNot): ?Identical
 
     private function isArray(Expr $expr): bool
     {
-        return $this->getType($expr) instanceof ArrayType;
+        return $this->getType($expr)->isArray()->yes();
     }
 
     private function processIdenticalOrNotIdentical(Node $node, FuncCall $funcCall, Expr $expr): ?Expr

diff --git a/rules/CodingStyle/Rector/If_/NullableCompareToNullRector.php b/rules/CodingStyle/Rector/If_/NullableCompareToNullRector.php
@@ -101,7 +101,7 @@ private function isNullableNonScalarType(Expr $expr): bool
 
         // is array?
         foreach ($staticType->getTypes() as $subType) {
-            if ($subType instanceof ArrayType) {
+            if ($subType->isArray()->yes()) {
                 return false;
             }
         }

diff --git a/rules/CodingStyle/TypeAnalyzer/IterableTypeAnalyzer.php b/rules/CodingStyle/TypeAnalyzer/IterableTypeAnalyzer.php
@@ -13,7 +13,7 @@ final class IterableTypeAnalyzer
 {
     public function detect(Type $type): bool
     {
-        if ($type instanceof ArrayType) {
+        if ($type->isArray()->yes()) {
             return true;
         }
 

diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -122,7 +122,7 @@ private function isUselessBeforeForeachCheck(If_ $if, Scope $scope): bool
         if (($if->cond instanceof Variable || $this->propertyFetchAnalyzer->isPropertyFetch($if->cond))
             && $this->nodeComparator->areNodesEqual($if->cond, $foreachExpr)
         ) {
-            return $scope->getType($if->cond) instanceof ArrayType;
+            return $scope->getType($if->cond)->isArray()->yes();
         }
 
         if ($this->uselessIfCondBeforeForeachDetector->isMatchingNotIdenticalEmptyArray($if, $foreachExpr)) {

diff --git a/rules/DeadCode/UselessIfCondBeforeForeachDetector.php b/rules/DeadCode/UselessIfCondBeforeForeachDetector.php
@@ -53,7 +53,7 @@ public function isMatchingNotEmpty(If_ $if, Expr $foreachExpr, Scope $scope): bo
 
         // is array though?
         $arrayType = $scope->getType($empty->expr);
-        if (! $arrayType instanceof ArrayType) {
+        if (! $arrayType->isArray()->yes()) {
             return false;
         }
 

diff --git a/rules/Php80/NodeManipulator/TokenManipulator.php b/rules/Php80/NodeManipulator/TokenManipulator.php
@@ -62,7 +62,7 @@ public function refactorArrayToken(array $nodes, Variable $singleTokenVariable):
             }
 
             $tokenStaticType = $this->nodeTypeResolver->getType($node->var);
-            if (! $tokenStaticType instanceof ArrayType) {
+            if (! $tokenStaticType->isArray()->yes()) {
                 return null;
             }
 
@@ -88,7 +88,7 @@ public function refactorNonArrayToken(array $nodes, Variable $singleTokenVariabl
             }
 
             $tokenStaticType = $this->nodeTypeResolver->getType($node->expr);
-            if ($tokenStaticType instanceof ArrayType) {
+            if ($tokenStaticType->isArray()->yes()) {
                 return null;
             }
 
@@ -104,7 +104,7 @@ public function refactorNonArrayToken(array $nodes, Variable $singleTokenVariabl
             }
 
             $tokenStaticType = $this->nodeTypeResolver->getType($node->expr);
-            if ($tokenStaticType instanceof ArrayType) {
+            if ($tokenStaticType->isArray()->yes()) {
                 return null;
             }
 
@@ -237,7 +237,7 @@ private function replaceTokenDimFetchZeroWithGetTokenName(array $nodes, Variable
             }
 
             $tokenStaticType = $this->nodeTypeResolver->getType($possibleTokenArray->var);
-            if (! $tokenStaticType instanceof ArrayType) {
+            if (! $tokenStaticType->isArray()->yes()) {
                 return null;
             }
 

diff --git a/rules/Php80/Rector/FunctionLike/UnionTypesRector.php b/rules/Php80/Rector/FunctionLike/UnionTypesRector.php
@@ -231,7 +231,7 @@ private function filterOutDuplicatedArrayTypes(UnionType $unionType): UnionType
         $originalTypeCount = count($unionType->getTypes());
 
         foreach ($unionType->getTypes() as $unionedType) {
-            if ($unionedType instanceof ArrayType) {
+            if ($unionedType->isArray()->yes()) {
                 if ($hasArrayType) {
                     continue;
                 }

diff --git a/rules/Strict/NodeFactory/ExactCompareFactory.php b/rules/Strict/NodeFactory/ExactCompareFactory.php
@@ -50,7 +50,7 @@ public function createIdenticalFalsyCompare(
             return new Identical($expr, $this->nodeFactory->createFalse());
         }
 
-        if ($exprType instanceof ArrayType) {
+        if ($exprType->isArray()->yes()) {
             return new Identical($expr, new Array_([]));
         }
 
@@ -78,7 +78,7 @@ public function createNotIdenticalFalsyCompare(
             return new NotIdentical($expr, new LNumber(0));
         }
 
-        if ($exprType instanceof ArrayType) {
+        if ($exprType->isArray()->yes()) {
             return new NotIdentical($expr, new Array_([]));
         }
 

diff --git a/rules/TypeDeclaration/NodeTypeAnalyzer/PropertyTypeDecorator.php b/rules/TypeDeclaration/NodeTypeAnalyzer/PropertyTypeDecorator.php
@@ -61,7 +61,7 @@ public function decoratePropertyUnionType(
     private function isDocBlockRequired(UnionType $unionType): bool
     {
         foreach ($unionType->getTypes() as $unionedType) {
-            if ($unionedType instanceof ArrayType) {
+            if ($unionedType->isArray()->yes()) {
                 $describedArray = $unionedType->describe(VerbosityLevel::value());
                 if ($describedArray !== 'array') {
                     return true;

diff --git a/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php b/rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictNewArrayRector.php
@@ -124,7 +124,7 @@ public function refactor(Node $node): ?Node
 
         $returnType = $this->nodeTypeResolver->getType($onlyReturn->expr);
 
-        if (! $returnType instanceof ArrayType) {
+        if (! $returnType->isArray()->yes()) {
             return null;
         }
 
@@ -221,7 +221,7 @@ private function shouldAddReturnArrayDocType(Type $exprType): bool
             return ! $exprType->getItemType() instanceof NeverType;
         }
 
-        return $exprType instanceof ArrayType;
+        return $exprType->isArray()->yes();
     }
 
     private function narrowConstantArrayType(Type $type): Type

diff --git a/rules/TypeDeclaration/TypeAlreadyAddedChecker/ReturnTypeAlreadyAddedChecker.php b/rules/TypeDeclaration/TypeAlreadyAddedChecker/ReturnTypeAlreadyAddedChecker.php
@@ -148,7 +148,7 @@ private function isStaticTypeIterable(Type $type): bool
 
     private function isArrayIterableOrIteratorType(Type $type): bool
     {
-        if ($type instanceof ArrayType) {
+        if ($type->isArray()->yes()) {
             return true;
         }
 

diff --git a/rules/TypeDeclaration/TypeAnalyzer/IterableTypeAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/IterableTypeAnalyzer.php
@@ -25,7 +25,7 @@ public function isIterableType(Type $type): bool
             return true;
         }
 
-        if ($type instanceof ArrayType) {
+        if ($type->isArray()->yes()) {
             return true;
         }
 

diff --git a/...eDeclaration/TypeInferer/PropertyTypeInferer/GetterTypeDeclarationPropertyTypeInferer.php b/...eDeclaration/TypeInferer/PropertyTypeInferer/GetterTypeDeclarationPropertyTypeInferer.php
@@ -48,7 +48,7 @@ public function inferProperty(Property $property): ?Type
                 $classMethod
             );
             // let PhpDoc solve that later for more precise type
-            if ($returnType instanceof ArrayType) {
+            if ($returnType->isArray()->yes()) {
                 return new MixedType();
             }
 

diff --git a/...TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php b/...TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php
@@ -142,7 +142,7 @@ private function resolveFromParamType(Param $param, ClassMethod $classMethod, st
         $types = [];
 
         // it's an array - annotation → make type more precise, if possible
-        if ($type instanceof ArrayType || $param->variadic) {
+        if ($type->isArray()->yes() || $param->variadic) {
             $types[] = $this->getResolveParamStaticTypeAsPHPStanType($classMethod, $propertyName);
         } else {
             $types[] = $type;

diff --git a/rules/TypeDeclaration/TypeNormalizer.php b/rules/TypeDeclaration/TypeNormalizer.php
@@ -200,7 +200,7 @@ private function createArrayTypeFromNonConstantValueTypes(array $nonConstantValu
     private function collectNestedArrayTypeFromUnionType(UnionType $unionType, int $arrayNesting): void
     {
         foreach ($unionType->getTypes() as $unionedType) {
-            if ($unionedType instanceof ArrayType) {
+            if ($unionedType->isArray()->yes()) {
                 ++$arrayNesting;
                 $this->normalizeArrayOfUnionToUnionArray($unionedType, $arrayNesting);
             } else {