Use getFiniteTypes() in some places

phpstan · Jun 19, 2023 · fa9a951 · fa9a951
1 parent 7912caf
commit fa9a951
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -1309,10 +1309,10 @@ public function resolveIdenticalType(Type $leftType, Type $rightType): BooleanTy
 			return new ConstantBooleanType($leftType->getValue() === $rightType->getValue());
 		}
 
-		$leftTypeEnumCases = $leftType->getEnumCases();
-		$rightTypeEnumCases = $rightType->getEnumCases();
-		if (count($leftTypeEnumCases) === 1 && count($rightTypeEnumCases) === 1) {
-			return new ConstantBooleanType($leftTypeEnumCases[0]->equals($rightTypeEnumCases[0]));
+		$leftTypeFiniteTypes = $leftType->getFiniteTypes();
+		$rightTypeFiniteType = $rightType->getFiniteTypes();
+		if (count($leftTypeFiniteTypes) === 1 && count($rightTypeFiniteType) === 1) {
+			return new ConstantBooleanType($leftTypeFiniteTypes[0]->equals($rightTypeFiniteType[0]));
 		}
 
 		$isSuperset = $leftType->isSuperTypeOf($rightType);

diff --git a/src/Rules/Comparison/ImpossibleCheckTypeHelper.php b/src/Rules/Comparison/ImpossibleCheckTypeHelper.php
@@ -99,10 +99,8 @@ public function findSpecifiedType(
 					$needleArg = $node->getArgs()[0]->value;
 					$needleType = ($this->treatPhpDocTypesAsCertain ? $scope->getType($needleArg) : $scope->getNativeType($needleArg));
 					$valueType = $haystackType->getIterableValueType();
-					$constantNeedleTypesCount = count($needleType->getConstantScalarValues())
-						+ count($needleType->getEnumCases());
-					$constantHaystackTypesCount = count($valueType->getConstantScalarValues())
-						+ count($valueType->getEnumCases());
+					$constantNeedleTypesCount = count($needleType->getFiniteTypes());
+					$constantHaystackTypesCount = count($valueType->getFiniteTypes());
 					$isNeedleSupertype = $needleType->isSuperTypeOf($valueType);
 					if ($haystackType->isConstantArray()->no()) {
 						if ($haystackType->isIterableAtLeastOnce()->yes()) {