drop uses of instanceof NullType

phpstan · Nov 7, 2022 · aaa752a · aaa752a
1 parent 85cc1ff
commit aaa752a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 20 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -875,7 +875,7 @@ private function resolveType(Expr $node): Type
 					$node->left instanceof Node\Expr\PropertyFetch
 					|| $node->left instanceof Node\Expr\StaticPropertyFetch
 				)
-				&& $rightType instanceof NullType
+				&& $rightType->isNull()->yes()
 				&& !$this->hasPropertyNativeType($node->left)
 			) {
 				return new BooleanType();
@@ -886,7 +886,7 @@ private function resolveType(Expr $node): Type
 					$node->right instanceof Node\Expr\PropertyFetch
 					|| $node->right instanceof Node\Expr\StaticPropertyFetch
 				)
-				&& $leftType instanceof NullType
+				&& $leftType->isNull()->yes()
 				&& !$this->hasPropertyNativeType($node->right)
 			) {
 				return new BooleanType();

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2167,7 +2167,7 @@ static function (?Type $offsetType, Type $valueType, bool $optional) use (&$arra
 							$thisType = null;
 							if (isset($expr->getArgs()[1])) {
 								$argType = $scope->getType($expr->getArgs()[1]->value);
-								if ($argType instanceof NullType) {
+								if ($argType->isNull()->yes()) {
 									$thisType = null;
 								} else {
 									$thisType = $argType;

diff --git a/src/Reflection/Php/PhpParameterFromParserNodeReflection.php b/src/Reflection/Php/PhpParameterFromParserNodeReflection.php
@@ -5,7 +5,6 @@
 use PHPStan\Reflection\ParameterReflectionWithPhpDocs;
 use PHPStan\Reflection\PassedByReference;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypehintHelper;
@@ -43,7 +42,7 @@ public function getType(): Type
 		if ($this->type === null) {
 			$phpDocType = $this->phpDocType;
 			if ($phpDocType !== null && $this->defaultValue !== null) {
-				if ($this->defaultValue instanceof NullType) {
+				if ($this->defaultValue->isNull()->yes()) {
 					$inferred = $phpDocType->inferTemplateTypes($this->defaultValue);
 					if ($inferred->isEmpty()) {
 						$phpDocType = TypeCombinator::addNull($phpDocType);

diff --git a/src/Reflection/Php/PhpParameterReflection.php b/src/Reflection/Php/PhpParameterReflection.php
@@ -8,7 +8,6 @@
 use PHPStan\Reflection\ParameterReflectionWithPhpDocs;
 use PHPStan\Reflection\PassedByReference;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypehintHelper;
@@ -52,7 +51,7 @@ public function getType(): Type
 					$this->reflection->getDefaultValueExpression(),
 					InitializerExprContext::fromReflectionParameter($this->reflection),
 				);
-				if ($defaultValueType instanceof NullType) {
+				if ($defaultValueType->isNull()->yes()) {
 					$phpDocType = TypeCombinator::addNull($phpDocType);
 				}
 			}

diff --git a/src/Rules/Operators/InvalidComparisonOperationRule.php b/src/Rules/Operators/InvalidComparisonOperationRule.php
@@ -11,7 +11,6 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -106,7 +105,7 @@ private function isPossiblyNullableObjectType(Scope $scope, Node\Expr $expr): bo
 			return false;
 		}
 
-		if (TypeCombinator::containsNull($type) && !$type instanceof NullType) {
+		if (TypeCombinator::containsNull($type) && !$type->isNull()->yes()) {
 			$type = TypeCombinator::removeNull($type);
 		}
 
@@ -127,7 +126,7 @@ private function isPossiblyNullableArrayType(Scope $scope, Node\Expr $expr): boo
 			static fn (Type $type): bool => $type->isArray()->yes(),
 		)->getType();
 
-		if (TypeCombinator::containsNull($type) && !$type instanceof NullType) {
+		if (TypeCombinator::containsNull($type) && !$type->isNull()->yes()) {
 			$type = TypeCombinator::removeNull($type);
 		}
 

diff --git a/src/Rules/RuleLevelHelper.php b/src/Rules/RuleLevelHelper.php
@@ -169,7 +169,7 @@ public function findTypeToCheck(
 			return new FoundTypeResult(new ErrorType(), [], [], null);
 		}
 		$type = $scope->getType($var);
-		if (!$this->checkNullables && !$type instanceof NullType) {
+		if (!$this->checkNullables && !$type->isNull()->yes()) {
 			$type = TypeCombinator::removeNull($type);
 		}
 

diff --git a/src/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRule.php b/src/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRule.php
@@ -7,7 +7,6 @@
 use PHPStan\Node\InArrowFunctionNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\NullType;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 use function sprintf;
@@ -40,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$returnType = $scope->getType($expr);
-		if ($returnType instanceof NullType) {
+		if ($returnType->isNull()->yes()) {
 			return [];
 		}
 		$messages = [];

diff --git a/src/Rules/TooWideTypehints/TooWideClosureReturnTypehintRule.php b/src/Rules/TooWideTypehints/TooWideClosureReturnTypehintRule.php
@@ -7,7 +7,6 @@
 use PHPStan\Node\ClosureReturnStatementsNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\NullType;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
@@ -62,7 +61,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$returnType = TypeCombinator::union(...$returnTypes);
-		if ($returnType instanceof NullType) {
+		if ($returnType->isNull()->yes()) {
 			return [];
 		}
 

diff --git a/src/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRule.php b/src/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRule.php
@@ -10,7 +10,6 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Type\NullType;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
@@ -71,7 +70,7 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			if ($type instanceof NullType && !$node->hasNativeReturnTypehint()) {
+			if ($type->isNull()->yes() && !$node->hasNativeReturnTypehint()) {
 				foreach ($node->getExecutionEnds() as $executionEnd) {
 					if ($executionEnd->getStatementResult()->isAlwaysTerminating()) {
 						continue;

diff --git a/src/Rules/TooWideTypehints/TooWideMethodReturnTypehintRule.php b/src/Rules/TooWideTypehints/TooWideMethodReturnTypehintRule.php
@@ -11,7 +11,6 @@
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\NullType;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
@@ -80,7 +79,7 @@ public function processNode(Node $node, Scope $scope): array
 		$returnType = TypeCombinator::union(...$returnTypes);
 		if (
 			!$method->isPrivate()
-			&& ($returnType instanceof NullType || $returnType instanceof ConstantBooleanType)
+			&& ($returnType->isNull()->yes() || $returnType instanceof ConstantBooleanType)
 			&& !$isFirstDeclaration
 		) {
 			return [];
@@ -92,7 +91,7 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			if ($type instanceof NullType && !$node->hasNativeReturnTypehint()) {
+			if ($type->isNull()->yes() && !$node->hasNativeReturnTypehint()) {
 				foreach ($node->getExecutionEnds() as $executionEnd) {
 					if ($executionEnd->getStatementResult()->isAlwaysTerminating()) {
 						continue;