Move instanceof PHPStan Type to ->is*() take 1

rules/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector.php

@@ -16,7 +16,6 @@
 use PhpParser\NodeTraverser;
 use PHPStan\Type\NullType;
 use PHPStan\Type\UnionType;
-use PHPStan\Type\VoidType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
@@ -157,7 +156,7 @@ private function transformDocUnionVoidToUnionNull(ClassMethod|Function_ $node):
         $newTypes = [];
         $hasChanged = false;
         foreach ($returnType->getTypes() as $type) {
-            if ($type instanceof VoidType) {
+            if ($type->isVoid()->yes()) {
                 $type = new NullType();
                 $hasChanged = true;
             }

rules/CodeQuality/Rector/Empty_/SimplifyEmptyCheckOnEmptyArrayRector.php

@@ -18,8 +18,8 @@
 use PhpParser\Node\Stmt\Property;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Type\ArrayType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\Type;
 use Rector\NodeAnalyzer\ExprAnalyzer;
 use Rector\Php\ReservedKeywordAnalyzer;
 use Rector\PhpParser\AstResolver;
@@ -104,7 +104,7 @@ private function isAllowedVariable(Variable $variable): bool
 
     private function isAllowedExpr(Expr $expr, Scope $scope): bool
     {
-        if (! $scope->getType($expr) instanceof ArrayType) {
+        if (! $scope->getType($expr)->isArray()->yes()) {
             return false;
         }
 
@@ -134,7 +134,8 @@ private function isAllowedExpr(Expr $expr, Scope $scope): bool
         $nativeType = $phpPropertyReflection->getNativeType();
 
         if (! $nativeType instanceof MixedType) {
-            return $nativeType instanceof ArrayType;
+            return $nativeType->isArray()
+                ->yes();
         }
 
         $property = $this->astResolver->resolvePropertyFromPropertyReflection($phpPropertyReflection);
@@ -150,6 +151,11 @@ private function isAllowedExpr(Expr $expr, Scope $scope): bool
         }
 
         $type = $this->allAssignNodePropertyTypeInferer->inferProperty($property, $classReflection, $this->file);
-        return $type instanceof ArrayType;
+        if (! $type instanceof Type) {
+            return false;
+        }
+
+        return $type->isArray()
+            ->yes();
     }
 }

rules/CodeQuality/Rector/If_/SimplifyIfNullableReturnRector.php

@@ -14,7 +14,6 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;
-use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
@@ -225,11 +224,11 @@ private function processSimplifyNullableReturn(
             return null;
         }
 
-        if ($types[0] instanceof FullyQualifiedObjectType && $types[1] instanceof NullType && $className === $types[0]->getClassName()) {
+        if ($types[0] instanceof FullyQualifiedObjectType && $types[1]->isNull()->yes() && $className === $types[0]->getClassName()) {
             return $this->createDirectReturn($expression, $expr, $unionType);
         }
 
-        if ($types[0] instanceof NullType && $types[1] instanceof FullyQualifiedObjectType && $className === $types[1]->getClassName()) {
+        if ($types[0]->isNull()->yes() && $types[1] instanceof FullyQualifiedObjectType && $className === $types[1]->getClassName()) {
             return $this->createDirectReturn($expression, $expr, $unionType);
         }
 
@@ -249,7 +248,7 @@ private function isNotTypedNullable(array $types, string $className): bool
             return true;
         }
 
-        if (! $types[1] instanceof NullType) {
+        if (! $types[1]->isNull()->yes()) {
             return true;
         }
 

rules/DeadCode/Rector/If_/ReduceAlwaysFalseIfOrRector.php

@@ -7,7 +7,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;
 use PhpParser\Node\Stmt\If_;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use Rector\DeadCode\NodeAnalyzer\SafeLeftTypeBooleanAndOrAnalyzer;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -79,11 +78,7 @@ public function refactor(Node $node): ?Node
         $booleanOr = $node->cond;
 
         $conditionStaticType = $this->getType($booleanOr->left);
-        if (! $conditionStaticType instanceof ConstantBooleanType) {
-            return null;
-        }
-
-        if ($conditionStaticType->getValue()) {
+        if (! $conditionStaticType->isFalse()->yes()) {
             return null;
         }
 

rules/DeadCode/Rector/If_/RemoveAlwaysTrueIfConditionRector.php

@@ -18,8 +18,6 @@
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\If_;
 use PhpParser\NodeTraverser;
-use PHPStan\Type\ArrayType;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\IntersectionType;
 use Rector\DeadCode\NodeAnalyzer\SafeLeftTypeBooleanAndOrAnalyzer;
 use Rector\NodeAnalyzer\ExprAnalyzer;
@@ -101,11 +99,7 @@ public function refactor(Node $node): int|null|array|If_
         }
 
         $conditionStaticType = $this->getType($node->cond);
-        if (! $conditionStaticType instanceof ConstantBooleanType) {
-            return null;
-        }
-
-        if (! $conditionStaticType->getValue()) {
+        if (! $conditionStaticType->isTrue()->yes()) {
             return null;
         }
 
@@ -142,7 +136,7 @@ private function shouldSkipFromVariable(Expr $expr): bool
             $type = $this->getType($variable);
             if ($type instanceof IntersectionType) {
                 foreach ($type->getTypes() as $subType) {
-                    if ($subType instanceof ArrayType) {
+                    if ($subType->isArray()->yes()) {
                         return true;
                     }
                 }
@@ -175,11 +169,7 @@ private function refactorIfWithBooleanAnd(If_ $if): ?If_
         $booleanAnd = $if->cond;
 
         $leftType = $this->getType($booleanAnd->left);
-        if (! $leftType instanceof ConstantBooleanType) {
-            return null;
-        }
-
-        if (! $leftType->getValue()) {
+        if (! $leftType->isTrue()->yes()) {
             return null;
         }
 

rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php

@@ -21,7 +21,6 @@
 use PhpParser\Node\Stmt\While_;
 use PhpParser\NodeTraverser;
 use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\ConstantType;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
@@ -153,7 +152,7 @@ function (Node $subNode): null|int|Break_ {
     private function processVariableNum(Continue_ $continue, Variable $numVariable): Continue_ | Break_
     {
         $staticType = $this->getType($numVariable);
-        if (! $staticType instanceof ConstantType) {
+        if (! $staticType->isConstantValue()->yes()) {
             return $continue;
         }
 

rules/Php54/Rector/Break_/RemoveZeroBreakContinueRector.php

@@ -11,7 +11,6 @@
 use PhpParser\Node\Stmt\Break_;
 use PhpParser\Node\Stmt\Continue_;
 use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\ConstantType;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractRector;
 use Rector\ValueObject\PhpVersionFeature;
@@ -115,7 +114,7 @@ private function processVariableNum(Break_ | Continue_ $stmt, Variable $numVaria
     {
         $staticType = $this->getType($numVariable);
 
-        if ($staticType instanceof ConstantType) {
+        if ($staticType->isConstantValue()->yes()) {
             if ($staticType instanceof ConstantIntegerType) {
                 if ($staticType->getValue() === 0) {
                     $stmt->num = null;

rules/Php72/Rector/FuncCall/GetClassOnNullRector.php

@@ -12,7 +12,6 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\NodeTraverser;
 use PHPStan\Analyser\Scope;
-use PHPStan\Type\NullType;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractScopeAwareRector;
 use Rector\ValueObject\PhpVersionFeature;
@@ -104,7 +103,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             $firstArgValue = $firstArg->value;
 
             $firstArgType = $this->getType($firstArgValue);
-            if (! $this->nodeTypeResolver->isNullableType($firstArgValue) && ! $firstArgType instanceof NullType) {
+            if (! $this->nodeTypeResolver->isNullableType($firstArgValue) && ! $firstArgType->isNull()->yes()) {
                 return null;
             }
 

rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php

@@ -22,7 +22,6 @@
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 use Rector\NodeAnalyzer\ArgsAnalyzer;
@@ -263,7 +262,7 @@ private function isValidUnionType(Type $type): bool
     private function shouldSkipType(Type $type): bool
     {
         return ! $type instanceof MixedType &&
-            ! $type instanceof NullType &&
+            ! $type->isNull()->yes() &&
             ! $this->isValidUnionType($type);
     }
 

rules/Strict/NodeFactory/ExactCompareFactory.php

@@ -21,7 +21,6 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
-use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeWithClassName;
@@ -55,7 +54,7 @@ public function createIdenticalFalsyCompare(
             return new Identical($expr, $this->nodeFactory->createFalse());
         } elseif ($exprType->isArray()->yes()) {
             return new Identical($expr, new Array_([]));
-        } elseif ($exprType instanceof NullType) {
+        } elseif ($exprType->isNull()->yes()) {
             return new Identical($expr, $this->nodeFactory->createNull());
         } elseif (! $exprType instanceof UnionType) {
             return null;

rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php

@@ -10,7 +10,6 @@
 use PhpParser\Node\Identifier;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
@@ -108,7 +107,7 @@ private function unionToSingleType(array $staticTypesByArgumentPosition): array
             return $staticTypeByArgumentPosition;
         }
 
-        if (! $staticTypeByArgumentPosition[0] instanceof NullType) {
+        if (! $staticTypeByArgumentPosition[0]->isNull()->yes()) {
             return $staticTypeByArgumentPosition;
         }
 

rules/TypeDeclaration/NodeAnalyzer/CallerParamMatcher.php

@@ -22,7 +22,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NullType;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
 use Rector\PhpParser\AstResolver;
@@ -71,7 +70,7 @@ public function matchCallParamType(
             return $callParam->type;
         }
 
-        if (! $defaultType instanceof NullType) {
+        if (! $defaultType->isNull()->yes()) {
             return null;
         }
 

rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php

@@ -9,7 +9,6 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
-use PHPStan\Type\CallableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -126,11 +125,11 @@ private function shouldSkipArgumentStaticType(
 
     private function isClosureAndCallableType(Type $parameterStaticType, Type $argumentStaticType): bool
     {
-        if ($parameterStaticType instanceof CallableType && $this->isClosureObjectType($argumentStaticType)) {
+        if ($parameterStaticType->isCallable()->yes() && $this->isClosureObjectType($argumentStaticType)) {
             return true;
         }
 
-        return $argumentStaticType instanceof CallableType && $this->isClosureObjectType($parameterStaticType);
+        return $argumentStaticType->isCallable()->yes() && $this->isClosureObjectType($parameterStaticType);
     }
 
     private function isClosureObjectType(Type $type): bool

rules/TypeDeclaration/PhpDocParser/TypeExpressionFromVarTagResolver.php

@@ -25,7 +25,6 @@
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\StringType;
 use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareIntersectionTypeNode;
@@ -49,7 +48,7 @@ public function resolveTypeExpressionFromVarTag(TypeNode $typeNode, Variable $va
                 return new FuncCall(new Name($scalarTypeFunction), [$arg]);
             }
 
-            if ($scalarType instanceof NullType) {
+            if ($scalarType->isNull()->yes()) {
                 return new Identical($variable, new ConstFetch(new Name('null')));
             }
 

rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanStrictReturnsRector.php

@@ -29,7 +29,6 @@
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Type\BooleanType;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\PhpParser\Node\Value\ValueResolver;
 use Rector\Rector\AbstractScopeAwareRector;
@@ -181,10 +180,12 @@ private function isNativeBooleanReturnTypeFuncCall(FuncCall $funcCall): bool
         }
 
         foreach ($functionReflection->getVariants() as $parametersAcceptorWithPhpDoc) {
-            return $parametersAcceptorWithPhpDoc->getNativeReturnType() instanceof BooleanType;
+            if (! $parametersAcceptorWithPhpDoc->getNativeReturnType()->isBoolean()->yes()) {
+                return false;
+            }
         }
 
-        return false;
+        return true;
     }
 
     private function isBooleanOp(Expr $expr): bool

rules/TypeDeclaration/Rector/ClassMethod/ReturnTypeFromStrictTypedCallRector.php

@@ -16,7 +16,6 @@
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\UnionType as PhpParserUnionType;
 use PHPStan\Analyser\Scope;
-use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\UnionType;
 use Rector\Php\PhpVersionProvider;
@@ -175,7 +174,7 @@ private function processSingleUnionType(
         NullableType $nullableType
     ): Closure | ClassMethod | Function_ {
         $types = $unionType->getTypes();
-        $returnType = $types[0] instanceof ObjectType && $types[1] instanceof NullType
+        $returnType = $types[0] instanceof ObjectType && $types[1]->isNull()->yes()
             ? new NullableType(new FullyQualified($types[0]->getClassName()))
             : $nullableType;
 

rules/TypeDeclaration/TypeAnalyzer/PropertyTypeDefaultValueAnalyzer.php

@@ -6,7 +6,6 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\PropertyProperty;
-use PHPStan\Type\ArrayType;
 use PHPStan\Type\Type;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
@@ -25,7 +24,7 @@ public function doesConflictWithDefaultValue(PropertyProperty $propertyProperty,
 
         // the defaults can be in conflict
         $defaultType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($propertyProperty->default);
-        if ($defaultType instanceof ArrayType && $propertyType instanceof ArrayType) {
+        if ($defaultType->isArray()->yes() && $propertyType->isArray()->yes()) {
             return false;
         }
 

rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php

@@ -189,7 +189,7 @@ private function isParamNullable(Param $param): bool
 
         if ($param->default instanceof Expr) {
             $defaultValueStaticType = $this->nodeTypeResolver->getType($param->default);
-            if ($defaultValueStaticType instanceof NullType) {
+            if ($defaultValueStaticType->isNull()->yes()) {
                 return true;
             }
         }