fix: for using ConstantArrayTypeBuilder and UnionType

phpstan · ondrejmirtes · May 16, 2025 · Dec 25, 2024 · Dec 25, 2024 · Dec 25, 2024
commit 1ee1a792c4d4d681d74e52724e9ccd907f02116b
diff --git a/src/Type/Php/PregSplitDynamicReturnTypeExtension.php b/src/Type/Php/PregSplitDynamicReturnTypeExtension.php
@@ -26,6 +26,7 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\UnionType;
 use function count;
 use function is_array;
 use function is_int;
@@ -113,13 +114,16 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 				$returnStringType = new StringType();
 			}
 
-			$capturedArrayType = new ConstantArrayType(
-				[new ConstantIntegerType(0), new ConstantIntegerType(1)],
-				[$returnStringType, IntegerRangeType::fromInterval(0, null)],
-				[2],
-				[],
-				TrinaryLogic::createYes(),
+			$arrayTypeBuilder = ConstantArrayTypeBuilder::createEmpty();
+			$arrayTypeBuilder->setOffsetValueType(
+				new ConstantIntegerType(0),
+				$returnStringType
 			);
+			$arrayTypeBuilder->setOffsetValueType(
+				new ConstantIntegerType(1),
+				IntegerRangeType::fromInterval(0, null)
+			);
+			$capturedArrayType = $arrayTypeBuilder->getArray();
 
 			$returnInternalValueType = $returnStringType;
 			if ($capturesOffset !== null) {
@@ -203,7 +207,7 @@ private function isValidPattern(string $pattern): bool
 
 	private function isIntOrStringValue(Type $type): bool
 	{
-		return $type->isInteger()->yes() || $type->isString()->yes() || $type->isConstantScalarValue()->yes();
+		return (new UnionType([new IntegerType(), new StringType()]))->isSuperTypeOf($type)->yes();
 	}
 
 }