Revert "add Type::isNever and Type::isExplicitNever methods"

ondrejmirtes · ondrejmirtes · commit e52e0742f5a8 · 2025-11-11T10:06:23.000+01:00
This reverts commit 77035d4.
diff --git a/src/Rules/Api/ApiInstanceofTypeRule.php b/src/Rules/Api/ApiInstanceofTypeRule.php
@@ -38,7 +38,6 @@
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IterableType;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectShapeType;
 use PHPStan\Type\ObjectType;
@@ -80,7 +79,6 @@ final class ApiInstanceofTypeRule implements Rule
 		IntersectionType::class => null,
 		ConstantScalarType::class => 'Type::isConstantScalarValue() or Type::getConstantScalarTypes() or Type::getConstantScalarValues()',
 		ObjectShapeType::class => 'Type::isObject() and Type::hasProperty()',
-		NeverType::class => 'Type::isNever() or Type::isExplicitNever()',
 
 		// accessory types
 		NonEmptyArrayType::class => 'Type::isIterableAtLeastOnce()',
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -429,16 +429,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -337,16 +337,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/Accessory/AccessoryLowercaseStringType.php b/src/Type/Accessory/AccessoryLowercaseStringType.php
@@ -334,16 +334,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		if (
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -332,16 +332,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		if ($type->isNull()->yes()) {
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -332,16 +332,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		$falseyTypes = StaticTypeFactory::falsey();
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -337,16 +337,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		if ($type->isNull()->yes()) {
diff --git a/src/Type/Accessory/AccessoryUppercaseStringType.php b/src/Type/Accessory/AccessoryUppercaseStringType.php
@@ -334,16 +334,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		if (
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -347,16 +347,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -426,16 +426,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -415,16 +415,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		if ($type->isArray()->yes() && $type->isIterableAtLeastOnce()->no()) {
diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -399,16 +399,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -634,16 +634,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -806,16 +806,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -266,16 +266,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -796,16 +796,6 @@ public function isScalar(): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isScalar());
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isNever());
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isExplicitNever());
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return $this->intersectResults(
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -411,16 +411,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/JustNullableTypeTrait.php b/src/Type/JustNullableTypeTrait.php
@@ -164,16 +164,6 @@ public function getObjectTypeOrClassStringObjectType(): Type
 		return new ErrorType();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function isVoid(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -1065,16 +1065,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -548,16 +548,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createYes();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createFromBoolean($this->isExplicit);
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -335,16 +335,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		if ($type instanceof ConstantScalarType) {
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -1327,16 +1327,6 @@ public function isScalar(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return TrinaryLogic::createNo();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		if ($type->isTrue()->yes()) {
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -669,16 +669,6 @@ public function isScalar(): TrinaryLogic
 		return $this->getStaticObjectType()->isScalar();
 	}
 
-	public function isNever(): TrinaryLogic
-	{
-		return $this->getStaticObjectType()->isNever();
-	}
-
-	public function isExplicitNever(): TrinaryLogic
-	{
-		return $this->getStaticObjectType()->isExplicitNever();
-	}
-
 	public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 	{
 		return new BooleanType();
diff --git a/src/Type/StrictMixedType.php b/src/Type/StrictMixedType.php
diff --git a/src/Type/Traits/ArrayTypeTrait.php b/src/Type/Traits/ArrayTypeTrait.php
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
diff --git a/src/Type/Traits/ObjectTypeTrait.php b/src/Type/Traits/ObjectTypeTrait.php
diff --git a/src/Type/Type.php b/src/Type/Type.php
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
diff --git a/src/Type/VoidType.php b/src/Type/VoidType.php
