Get rid of instanceof *Type checks

Author: staabm

phpstan-baseline.neon

@@ -1522,8 +1522,8 @@ parameters:
 			path: src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php
 
 		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantStringType is error-prone and deprecated. Use Type::getConstantStrings() instead.'
-			identifier: phpstanApi.instanceofType
+			rawMessage: 'Method PHPStan\Type\Php\ArrayCombineFunctionReturnTypeExtension::sanitizeConstantArrayKeyTypes() should return array<int, PHPStan\Type\Constant\ConstantIntegerType|PHPStan\Type\Constant\ConstantStringType>|null but returns list<PHPStan\Type\ConstantScalarType>.'
+			identifier: return.type
 			count: 1
 			path: src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php
 

src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php

@@ -23,6 +23,8 @@
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use function count;
+use function is_int;
+use function is_string;
 
 #[AutowiredService]
 final class ArrayCombineFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension
@@ -125,14 +127,19 @@ private function sanitizeConstantArrayKeyTypes(array $types): ?array
 				$type = $type->toString();
 			}
 
-			if (
-				!$type instanceof ConstantIntegerType
-				&& !$type instanceof ConstantStringType
-			) {
+			$scalars = $type->getConstantScalarTypes();
+			if (count($scalars) === 0) {
 				return null;
 			}
 
-			$sanitizedTypes[] = $type;
+			foreach ($scalars as $scalar) {
+				$value = $scalar->getValue();
+				if (!is_int($value) && !is_string($value)) {
+					return null;
+				}
+
+				$sanitizedTypes[] = $scalar;
+			}
 		}
 
 		return $sanitizedTypes;