Use IntegerRangeType::fromInterval() instead of new

zonuexe · zonuexe · commit 09ae19764dab · 2022-06-22T20:00:11.000+09:00
diff --git a/src/Type/Php/FilterVarDynamicReturnTypeExtension.php b/src/Type/Php/FilterVarDynamicReturnTypeExtension.php
@@ -165,9 +165,7 @@ public function getTypeFromFunctionCall(
 
 		if (isset($otherTypes['range'])) {
 			if ($type instanceof ConstantScalarType) {
-				if ($type->getValue() < $otherTypes['range']->getMin()
-					|| $type->getValue() > $otherTypes['range']->getMax()
-				) {
+				if ($otherTypes['range']->isSuperTypeOf($type)->no()) {
 					$type = $otherTypes['default'];
 				}
 
@@ -209,7 +207,7 @@ private function determineExactType(Type $in, int $filterValue): ?Type
 
 	/**
 	 * @param list<string> $typeOptionNames
-	 * @return array{default: Type, range?: IntegerRangeType}
+	 * @return array{default: Type, range?: Type}
 	 */
 	private function getOtherTypes(?Node\Arg $flagsArg, Scope $scope, array $typeOptionNames): array
 	{
@@ -246,7 +244,7 @@ private function getOtherTypes(?Node\Arg $flagsArg, Scope $scope, array $typeOpt
 		if (isset($range['min']) || isset($range['max'])) {
 			$min = isset($range['min']) && is_int($range['min']) ? $range['min'] : null;
 			$max = isset($range['max']) && is_int($range['max']) ? $range['max'] : null;
-			$otherTypes['range'] = new IntegerRangeType($min, $max);
+			$otherTypes['range'] = IntegerRangeType::fromInterval($min, $max);
 		}
 
 		return $otherTypes;
