Use TypeCombinator method instead of directly create instance objects

zonuexe · zonuexe · commit fec2ef66a702 · 2022-06-22T20:00:11.000+09:00
diff --git a/src/Type/Php/FilterVarDynamicReturnTypeExtension.php b/src/Type/Php/FilterVarDynamicReturnTypeExtension.php
@@ -21,12 +21,11 @@
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerRangeType;
 use PHPStan\Type\IntegerType;
-use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
-use PHPStan\Type\UnionType;
+use PHPStan\Type\TypeCombinator;
 use function is_int;
 use function sprintf;
 use function strtolower;
@@ -161,7 +160,7 @@ public function getTypeFromFunctionCall(
 		if ($inputType->isNonEmptyString()->yes()
 			&& $type instanceof StringType
 			&& !$this->canStringBeSanitized($filterValue, $flagsArg, $scope)) {
-			$type = new IntersectionType([$type, new AccessoryNonEmptyStringType()]);
+			$type = TypeCombinator::intersect($type, new AccessoryNonEmptyStringType());
 		}
 
 		if (isset($otherTypes['range'])) {
@@ -183,7 +182,7 @@ public function getTypeFromFunctionCall(
 		}
 
 		if (isset($otherTypes['default']) && $otherTypes['default']->isSuperTypeOf($type)->no()) {
-			$type = new UnionType([$type, $otherTypes['default']]);
+			$type = TypeCombinator::union($type, $otherTypes['default']);
 		}
 
 		if ($this->hasFlag($this->getConstant('FILTER_FORCE_ARRAY'), $flagsArg, $scope)) {
