Type::isConstantValue()

phpstan · Feb 20, 2023 · de1fa93 · de1fa93
1 parent 4c7046e
commit de1fa93
Show file tree

Hide file tree

Showing 40 changed files with 161 additions and 29 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1442,11 +1442,6 @@ parameters:
 			count: 2
 			path: src/Type/UnionType.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantBooleanType is error\\-prone and deprecated\\. Use Type\\:\\:isTrue\\(\\) or Type\\:\\:isFalse\\(\\) instead\\.$#"
-			count: 1
-			path: src/Type/UnionType.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Generic\\\\GenericClassStringType is error\\-prone and deprecated\\. Use Type\\:\\:isClassStringType\\(\\) and Type\\:\\:getClassStringObjectType\\(\\) instead\\.$#"
 			count: 1
@@ -1487,11 +1482,6 @@ parameters:
 			count: 2
 			path: src/Type/UnionTypeHelper.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\NullType is error\\-prone and deprecated\\. Use Type\\:\\:isNull\\(\\) instead\\.$#"
-			count: 1
-			path: src/Type/VerbosityLevel.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\VoidType is error\\-prone and deprecated\\. Use Type\\:\\:isVoid\\(\\) instead\\.$#"
 			count: 3

diff --git a/src/Analyser/ConstantResolver.php b/src/Analyser/ConstantResolver.php
@@ -10,7 +10,6 @@
 use PHPStan\Type\Constant\ConstantFloatType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
-use PHPStan\Type\ConstantType;
 use PHPStan\Type\GeneralizePrecision;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntersectionType;
@@ -293,7 +292,7 @@ public function resolvePredefinedConstant(string $resolvedConstantName): ?Type
 
 	public function resolveConstantType(string $constantName, Type $constantType): Type
 	{
-		if ($constantType instanceof ConstantType && in_array($constantName, $this->dynamicConstantNames, true)) {
+		if ($constantType->isConstantValue()->yes() && in_array($constantName, $this->dynamicConstantNames, true)) {
 			return $constantType->generalize(GeneralizePrecision::lessSpecific());
 		}
 

diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -39,7 +39,6 @@
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantScalarType;
-use PHPStan\Type\ConstantType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\FunctionTypeSpecifyingExtension;
 use PHPStan\Type\Generic\GenericClassStringType;
@@ -230,7 +229,7 @@ public function specifyTypesInCondition(
 			if (
 				$exprLeftType instanceof ConstantScalarType
 				|| count($exprLeftType->getEnumCases()) === 1
-				|| ($exprLeftType instanceof ConstantType && !$exprRightType->equals($exprLeftType) && $exprRightType->isSuperTypeOf($exprLeftType)->yes())
+				|| ($exprLeftType->isConstantValue()->yes() && !$exprRightType->equals($exprLeftType) && $exprRightType->isSuperTypeOf($exprLeftType)->yes())
 			) {
 				$types = $this->create(
 					$expr->right,
@@ -244,7 +243,7 @@ public function specifyTypesInCondition(
 			if (
 				$exprRightType instanceof ConstantScalarType
 				|| count($exprRightType->getEnumCases()) === 1
-				|| ($exprRightType instanceof ConstantType && !$exprLeftType->equals($exprRightType) && $exprLeftType->isSuperTypeOf($exprRightType)->yes())
+				|| ($exprRightType->isConstantValue()->yes() && !$exprLeftType->equals($exprRightType) && $exprLeftType->isSuperTypeOf($exprRightType)->yes())
 			) {
 				$leftType = $this->create(
 					$expr->left,

diff --git a/src/Rules/Api/ApiInstanceofTypeRule.php b/src/Rules/Api/ApiInstanceofTypeRule.php
@@ -27,6 +27,7 @@
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\ConstantType;
 use PHPStan\Type\Enum\EnumCaseObjectType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\Generic\GenericClassStringType;
@@ -71,6 +72,7 @@ class ApiInstanceofTypeRule implements Rule
 		GenericClassStringType::class => 'Type::isClassStringType() and Type::getClassStringObjectType()',
 		GenericObjectType::class => null,
 		IntersectionType::class => null,
+		ConstantType::class => 'Type::isConstantValue() or Type::generalize()',
 
 		// accessory types
 		NonEmptyArrayType::class => 'Type::isIterableAtLeastOnce()',

diff --git a/src/Rules/PhpDoc/VarTagTypeRuleHelper.php b/src/Rules/PhpDoc/VarTagTypeRuleHelper.php
@@ -9,7 +9,6 @@
 use PHPStan\PhpDoc\Tag\VarTag;
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\ConstantType;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -108,7 +107,7 @@ private function shouldVarTagTypeBeReported(Node\Expr $expr, Type $type, Type $v
 
 	private function checkType(Type $type, Type $varTagType): bool
 	{
-		if ($type instanceof ConstantType) {
+		if ($type->isConstantValue()->yes()) {
 			return $type->isSuperTypeOf($varTagType)->no();
 		}
 

diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -297,6 +297,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -200,6 +200,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -201,6 +201,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -201,6 +201,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -203,6 +203,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createMaybe();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -202,6 +202,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -257,6 +257,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -282,6 +282,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -268,6 +268,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -286,6 +286,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -353,6 +353,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -434,6 +434,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -113,6 +113,11 @@ public function getConstantArrays(): array
 		return [$this];
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createYes();
+	}
+
 	/** @deprecated Use isIterableAtLeastOnce()->no() instead */
 	public function isEmpty(): bool
 	{

diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -147,6 +147,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -759,6 +759,11 @@ public function isNull(): TrinaryLogic
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isNull());
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isConstantValue());
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isTrue());

diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -291,6 +291,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/JustNullableTypeTrait.php b/src/Type/JustNullableTypeTrait.php
@@ -72,6 +72,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -673,6 +673,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		if ($this->subtractedType !== null) {

diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -379,6 +379,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -203,6 +203,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createYes();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createYes();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -933,6 +933,11 @@ public function isNull(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
+	public function isConstantValue(): TrinaryLogic
+	{
+		return TrinaryLogic::createNo();
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();

diff --git a/src/Type/Php/CurlGetinfoFunctionDynamicReturnTypeExtension.php b/src/Type/Php/CurlGetinfoFunctionDynamicReturnTypeExtension.php
@@ -13,7 +13,6 @@
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
-use PHPStan\Type\ConstantType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
@@ -51,7 +50,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		$componentType = $scope->getType($functionCall->getArgs()[1]->value);
-		if ($componentType instanceof ConstantType === false || $componentType->equals(new NullType())) {
+		if (!$componentType->isNull()->no()) {
 			return $this->createAllComponentsReturnType();
 		}
 

diff --git a/src/Type/Php/MinMaxFunctionReturnTypeExtension.php b/src/Type/Php/MinMaxFunctionReturnTypeExtension.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\ConstantScalarType;
-use PHPStan\Type\ConstantType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\Type;
@@ -158,7 +157,7 @@ private function processType(
 	{
 		$resultType = null;
 		foreach ($types as $type) {
-			if (!$type instanceof ConstantType) {
+			if (!$type->isConstantValue()->yes()) {
 				return TypeCombinator::union(...$types);
 			}