Refactor

Author: VincentLanglet

src/Type/TypeUtils.php

@@ -5,7 +5,6 @@
 use PHPStan\Internal\CombinationsHelper;
 use PHPStan\Type\Accessory\AccessoryType;
 use PHPStan\Type\Accessory\HasPropertyType;
-use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Generic\TemplateBenevolentUnionType;
 use PHPStan\Type\Generic\TemplateType;
@@ -134,14 +133,23 @@ public static function toStrictUnion(Type $type): Type
 	 */
 	public static function flattenTypes(Type $type): array
 	{
-		if ($type instanceof ConstantArrayType) {
-			return $type->getAllArrays();
+		if ($type instanceof UnionType) {
+			$types = [];
+			foreach ($type->getTypes() as $innerType) {
+				$flattenTypes = self::flattenTypes($innerType);
+				foreach ($flattenTypes as $flattenType) {
+					$types[] = $flattenType;
+				}
+			}
+
+			return $types;
 		}
 
-		if ($type instanceof IntersectionType && $type->isConstantArray()->yes()) {
+		$constantArrays = $type->getConstantArrays();
+		if ($constantArrays !== []) {
 			$newTypes = [];
-			foreach ($type->getTypes() as $innerType) {
-				$newTypes[] = self::flattenTypes($innerType);
+			foreach ($constantArrays as $constantArray) {
+				$newTypes[] = $constantArray->getAllArrays();
 			}
 
 			return array_filter(
@@ -153,18 +161,6 @@ public static function flattenTypes(Type $type): array
 			);
 		}
 
-		if ($type instanceof UnionType) {
-			$types = [];
-			foreach ($type->getTypes() as $innerType) {
-				$flattenTypes = self::flattenTypes($innerType);
-				foreach ($flattenTypes as $flattenType) {
-					$types[] = $flattenType;
-				}
-			}
-
-			return $types;
-		}
-
 		return [$type];
 	}