add Type::isNever and Type::isExplicitNever methods

phpstan-baseline.neon

@@ -1437,6 +1437,18 @@ parameters:
 			count: 1
 			path: src/Type/IterableType.php
 
+		-
+			rawMessage: 'Doing instanceof PHPStan\Type\NeverType is error-prone and deprecated. Use Type::isNever() or Type::isExplicitNever() instead.'
+			identifier: phpstanApi.instanceofType
+			count: 2
+			path: src/Type/NeverType.php
+
+		-
+			rawMessage: 'Doing instanceof PHPStan\Type\NeverType is error-prone and deprecated. Use Type::isNever() or Type::isExplicitNever() instead.'
+			identifier: phpstanApi.instanceofType
+			count: 1
+			path: src/Type/NonAcceptingNeverType.php
+
 		-
 			rawMessage: 'Doing instanceof PHPStan\Type\ConstantScalarType is error-prone and deprecated. Use Type::isConstantScalarValue() or Type::getConstantScalarTypes() or Type::getConstantScalarValues() instead.'
 			identifier: phpstanApi.instanceofType
@@ -1767,6 +1779,12 @@ parameters:
 			count: 1
 			path: src/Type/TypehintHelper.php
 
+		-
+			rawMessage: 'Call to an undefined method PHPStan\Type\Type::isSubTypeOf().'
+			identifier: method.notFound
+			count: 1
+			path: src/Type/UnionType.php
+
 		-
 			rawMessage: 'Doing instanceof PHPStan\Type\CallableType is error-prone and deprecated. Use Type::isCallable() and Type::getCallableParametersAcceptors() instead.'
 			identifier: phpstanApi.instanceofType

src/Analyser/ExprHandler/BooleanAndHandler.php

@@ -19,7 +19,6 @@
 use PHPStan\Node\BooleanAndNode;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use function array_merge;
 
@@ -91,7 +90,7 @@
 		$leftTruthyScope = $leftResult->getTruthyScope();
 		$rightResult = $nodeScopeResolver->processExprNode($stmt, $expr->right, $leftTruthyScope, $storage, $nodeCallback, $context);
 		$rightExprType = $rightResult->getScope()->getType($expr->right);
-		if ($rightExprType instanceof NeverType && $rightExprType->isExplicit()) {
+		if ($rightExprType->isExplicitNever()->yes()) {
 			$leftMergedWithRightScope = $leftResult->getFalseyScope();
 		} else {
 			$leftMergedWithRightScope = $leftResult->getScope()->mergeWith($rightResult->getScope());

src/Analyser/ExprHandler/BooleanOrHandler.php

@@ -17,7 +17,6 @@
 use PHPStan\Node\BooleanOrNode;
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use function array_merge;
 
@@ -75,7 +74,7 @@
 		$leftFalseyScope = $leftResult->getFalseyScope();
 		$rightResult = $nodeScopeResolver->processExprNode($stmt, $expr->right, $leftFalseyScope, $storage, $nodeCallback, $context);
 		$rightExprType = $rightResult->getScope()->getType($expr->right);
-		if ($rightExprType instanceof NeverType && $rightExprType->isExplicit()) {
+		if ($rightExprType->isExplicitNever()->yes()) {
 			$leftMergedWithRightScope = $leftResult->getTruthyScope();
 		} else {
 			$leftMergedWithRightScope = $leftResult->getScope()->mergeWith($rightResult->getScope());

src/Analyser/ExprHandler/CoalesceHandler.php

@@ -13,7 +13,6 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\DependencyInjection\AutowiredService;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use function array_merge;
@@ -76,7 +75,7 @@
 		$rightScope = $scope->filterByFalseyValue($expr);
 		$rightResult = $nodeScopeResolver->processExprNode($stmt, $expr->right, $rightScope, $storage, $nodeCallback, $context->enterDeep());
 		$rightExprType = $scope->getType($expr->right);
-		if ($rightExprType instanceof NeverType && $rightExprType->isExplicit()) {
+		if ($rightExprType->isExplicitNever()->yes()) {
 			$scope = $scope->filterByTruthyValue(new Expr\Isset_([$expr->left]));
 		} else {
 			$scope = $scope->filterByTruthyValue(new Expr\Isset_([$expr->left]))->mergeWith($rightResult->getScope());

src/Analyser/ExprHandler/FuncCallHandler.php

@@ -52,7 +52,6 @@
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
@@ -160,7 +159,7 @@
 		if ($parametersAcceptor !== null) {
 			$normalizedExpr = ArgumentsNormalizer::reorderFuncArguments($parametersAcceptor, $expr) ?? $expr;
 			$returnType = $parametersAcceptor->getReturnType();
-			$isAlwaysTerminating = $isAlwaysTerminating || $returnType instanceof NeverType && $returnType->isExplicit();
+			$isAlwaysTerminating = $isAlwaysTerminating || $returnType->isExplicitNever()->yes();
 		}
 
 		if (
@@ -511,7 +510,7 @@
 		$throwType = $functionReflection->getThrowType();
 		if ($throwType === null && $parametersAcceptor !== null) {
 			$returnType = $parametersAcceptor->getReturnType();
-			if ($returnType instanceof NeverType && $returnType->isExplicit()) {
+			if ($returnType->isExplicitNever()->yes()) {
 				$throwType = new ObjectType(Throwable::class);
 			}
 		}

src/Analyser/ExprHandler/InstanceofHandler.php

@@ -17,7 +17,6 @@
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
 use PHPStan\Type\Type;
@@ -75,7 +74,7 @@
 		) {
 			return new BooleanType();
 		}
-		if ($expressionType instanceof NeverType) {
+		if ($expressionType->isNever()->yes()) {
 			return new ConstantBooleanType(false);
 		}
 

src/Analyser/ExprHandler/MatchHandler.php

@@ -442,7 +442,7 @@
 		$isExhaustive = $hasDefaultCond || $hasAlwaysTrueCond;
 		if (!$isExhaustive) {
 			$remainingType = $matchScope->getType($expr->cond);
-			if ($remainingType instanceof NeverType) {
+			if ($remainingType->isNever()->yes()) {
 				$isExhaustive = true;
 			}
 		}
@@ -548,7 +548,7 @@
 	{
 		foreach ($varNames as $varName) {
 			$type = $scope->getVariableType($varName);
-			if ($type instanceof NeverType) {
+			if ($type->isNever()->yes()) {
 				return true;
 			}
 		}

src/Analyser/ExprHandler/MethodCallHandler.php

@@ -34,7 +34,6 @@
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Generic\TemplateTypeVarianceMap;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -140,7 +139,7 @@
 		if ($parametersAcceptor !== null) {
 			$normalizedExpr = ArgumentsNormalizer::reorderMethodArguments($parametersAcceptor, $expr) ?? $expr;
 			$returnType = $parametersAcceptor->getReturnType();
-			$isAlwaysTerminating = $returnType instanceof NeverType && $returnType->isExplicit();
+			$isAlwaysTerminating = $returnType->isExplicitNever()->yes();
 		}
 
 		$argsResult = $nodeScopeResolver->processArgs(
@@ -262,7 +261,7 @@
 		$throwType = $methodReflection->getThrowType();
 		if ($throwType === null) {
 			$returnType = $parametersAcceptor->getReturnType();
-			if ($returnType instanceof NeverType && $returnType->isExplicit()) {
+			if ($returnType->isExplicitNever()->yes()) {
 				$throwType = new ObjectType(Throwable::class);
 			}
 		}

src/Analyser/ExprHandler/NewHandler.php

@@ -41,7 +41,6 @@
 use PHPStan\Type\Generic\GenericStaticType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeMap;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\NonexistentParentClassType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
@@ -394,7 +393,7 @@ private function exactInstantiation(MutatingScope $scope, New_ $node, Name $clas
 		}
 
 		$methodResult = $scope->getType($methodCall);
-		if ($methodResult instanceof NeverType && $methodResult->isExplicit()) {
+		if ($methodResult->isExplicitNever()->yes()) {
 			return $methodResult;
 		}
 

src/Analyser/ExprHandler/StaticCallHandler.php

@@ -33,7 +33,6 @@
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
 use PHPStan\Type\Type;
@@ -197,7 +196,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		if ($parametersAcceptor !== null) {
 			$normalizedExpr = ArgumentsNormalizer::reorderStaticCallArguments($parametersAcceptor, $expr) ?? $expr;
 			$returnType = $parametersAcceptor->getReturnType();
-			$isAlwaysTerminating = $returnType instanceof NeverType && $returnType->isExplicit();
+			$isAlwaysTerminating = $returnType->isExplicitNever()->yes();
 		}
 		$argsResult = $nodeScopeResolver->processArgs($stmt, $methodReflection, null, $parametersAcceptor, $normalizedExpr, $scope, $storage, $nodeCallback, $context, $closureBindScope);
 		$scope = $argsResult->getScope();

src/Analyser/ExprHandler/TernaryHandler.php

@@ -13,7 +13,6 @@
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\NoopNodeCallback;
 use PHPStan\DependencyInjection\AutowiredService;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use function array_merge;
@@ -104,12 +103,12 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		} elseif ($condType->isFalse()->yes()) {
 			$finalScope = $ifFalseScope;
 		} else {
-			if ($ifTrueType instanceof NeverType && $ifTrueType->isExplicit()) {
+			if ($ifTrueType !== null && $ifTrueType->isExplicitNever()->yes()) {
 				$finalScope = $ifFalseScope;
 			} else {
 				$ifFalseType = $ifFalseScope->getType($expr->else);
 
-				if ($ifFalseType instanceof NeverType && $ifFalseType->isExplicit()) {
+				if ($ifFalseType->isExplicitNever()->yes()) {
 					$finalScope = $ifTrueScope;
 				} else {
 					$finalScope = $ifTrueScope->mergeWith($ifFalseScope);

src/Analyser/MutatingScope.php

@@ -84,7 +84,6 @@
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
@@ -3023,12 +3022,12 @@ public function addTypeToExpression(Expr $expr, Type $type): self
 
 	public function removeTypeFromExpression(Expr $expr, Type $typeToRemove): self
 	{
-		if ($typeToRemove instanceof NeverType) {
+		if ($typeToRemove->isNever()->yes()) {
 			return $this;
 		}
 
 		$exprType = $this->getType($expr);
-		if ($exprType instanceof NeverType) {
+		if ($exprType->isNever()->yes()) {
 			return $this;
 		}
 
@@ -4532,7 +4531,7 @@ public function getIterableKeyType(Type $iteratee): Type
 	{
 		if ($iteratee instanceof UnionType) {
 			$filtered = $iteratee->filterTypes(static fn (Type $innerType) => $innerType->isIterable()->yes());
-			if (!$filtered instanceof NeverType) {
+			if ($filtered->isNever()->no()) {
 				$iteratee = $filtered;
 			}
 		}
@@ -4544,7 +4543,7 @@ public function getIterableValueType(Type $iteratee): Type
 	{
 		if ($iteratee instanceof UnionType) {
 			$filtered = $iteratee->filterTypes(static fn (Type $innerType) => $innerType->isIterable()->yes());
-			if (!$filtered instanceof NeverType) {
+			if ($filtered->isNever()->no()) {
 				$iteratee = $filtered;
 			}
 		}

src/Analyser/NodeScopeResolver.php

@@ -1799,7 +1799,7 @@ public function processStmtNode(
 				}
 			}
 
-			$exhaustive = $scopeForBranches->getType($stmt->cond) instanceof NeverType;
+			$exhaustive = $scopeForBranches->getType($stmt->cond)->isNever()->yes();
 
 			if (!$hasDefaultCase && !$exhaustive) {
 				$alwaysTerminating = false;
@@ -1949,7 +1949,7 @@ public function processStmtNode(
 				foreach ($throwPoints as $throwPoint) {
 					$newThrowPoint = $throwPoint->subtractCatchType($originalCatchType);
 
-					if ($newThrowPoint->getType() instanceof NeverType) {
+					if (!$newThrowPoint->getType()->isNever()->no()) {
 						continue;
 					}
 
@@ -2460,7 +2460,7 @@ private function findEarlyTerminatingExpr(Expr $expr, Scope $scope): ?Expr
 		}
 
 		$exprType = $scope->getType($expr);
-		if ($exprType instanceof NeverType && $exprType->isExplicit()) {
+		if ($exprType->isExplicitNever()->yes()) {
 			return $expr;
 		}
 
@@ -2723,7 +2723,7 @@ public function processClosureNode(
 		}
 
 		$returnType = $closureType->getReturnType();
-		$isAlwaysTerminating = ($returnType instanceof NeverType && $returnType->isExplicit());
+		$isAlwaysTerminating = ($returnType->isExplicitNever()->yes());
 
 		$this->callNodeCallback($nodeCallback, new InClosureNode($closureType, $expr), $closureScope, $storage);
 
@@ -3416,7 +3416,7 @@ public function processArgs(
 							$throwPoints = array_merge($throwPoints, $callableThrowPoints);
 							$impurePoints = array_merge($impurePoints, array_map(static fn (SimpleImpurePoint $impurePoint) => new ImpurePoint($scope, $arg->value, $impurePoint->getIdentifier(), $impurePoint->getDescription(), $impurePoint->isCertain()), $acceptors[0]->getImpurePoints()));
 							$returnType = $acceptors[0]->getReturnType();
-							$isAlwaysTerminating = $isAlwaysTerminating || ($returnType instanceof NeverType && $returnType->isExplicit());
+							$isAlwaysTerminating = $isAlwaysTerminating || ($returnType->isExplicitNever()->yes());
 						}
 					}
 				}
@@ -4088,7 +4088,7 @@ public function processCalledMethod(MethodReflection $methodReflection): ?Mutati
 				$endNode = $executionEnd->getNode();
 				if ($endNode instanceof Node\Stmt\Expression) {
 					$exprType = $statementResult->getScope()->getType($endNode->expr);
-					if ($exprType instanceof NeverType && $exprType->isExplicit()) {
+					if ($exprType->isExplicitNever()->yes()) {
 						continue;
 					}
 				}

src/Analyser/TypeSpecifier.php

@@ -1628,7 +1628,7 @@ private function getConditionalSpecifiedTypes(
 			(
 				$argumentExpr instanceof Node\Scalar
 				|| ($argumentExpr instanceof ConstFetch && in_array(strtolower($argumentExpr->name->toString()), ['true', 'false', 'null'], true))
-			) && ($ifType instanceof NeverType || $elseType instanceof NeverType)
+			) && ($ifType->isNever()->yes() || $elseType->isNever()->yes())
 		) {
 			return null;
 		}

src/Node/ClassPropertiesNode.php

@@ -21,7 +21,6 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Rules\Properties\ReadWritePropertiesExtensionProvider;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\TypeUtils;
 use function array_diff_key;
 use function array_key_exists;
@@ -276,7 +275,7 @@ private function collectUninitializedProperties(array $constructors, array $unin
 				if ($statementResult->isAlwaysTerminating()) {
 					if ($endNode instanceof Node\Stmt\Expression) {
 						$exprType = $statementResult->getScope()->getType($endNode->expr);
-						if ($exprType instanceof NeverType && $exprType->isExplicit()) {
+						if ($exprType->isExplicitNever()->yes()) {
 							continue;
 						}
 					}

src/Reflection/Callables/FunctionCallableVariant.php

@@ -10,7 +10,6 @@
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVarianceMap;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Throwable;
@@ -98,7 +97,7 @@ public function getThrowPoints(): array
 		$returnType = $this->variant->getReturnType();
 		$throwType = $this->function->getThrowType();
 		if ($throwType === null) {
-			if ($returnType instanceof NeverType && $returnType->isExplicit()) {
+			if ($returnType->isExplicitNever()->yes()) {
 				$throwType = new ObjectType(Throwable::class);
 			}
 		}