Optimize more

ondrejmirtes · ondrejmirtes · commit 7e2941ec6ca7 · 2022-09-07T17:05:55.000+02:00
diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -590,7 +590,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp
 		}
 		if (count($arrayTypes) === 1) {
 			return [
-				self::intersect($arrayTypes[0], ...$accessoryTypes),
+				self::intersect(...self::optimizeConstantArrays($arrayTypes), ...$accessoryTypes),
 			];
 		}
 
@@ -632,7 +632,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp
 			return [
 				self::intersect(new ArrayType(
 					self::union(...$keyTypesForGeneralArray),
-					self::union(...$valueTypesForGeneralArray),
+					self::union(...self::optimizeConstantArrays($valueTypesForGeneralArray)),
 				), ...$accessoryTypes),
 			];
 		}

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp`
`590`	`590`	`}`
`591`	`591`	`if (count($arrayTypes) === 1) {`
`592`	`592`	`return [`
`593`		`- self::intersect($arrayTypes[0], ...$accessoryTypes),`
	`593`	`+ self::intersect(...self::optimizeConstantArrays($arrayTypes), ...$accessoryTypes),`
`594`	`594`	`];`
`595`	`595`	`}`
`596`	`596`
`@@ -632,7 +632,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp`
`632`	`632`	`return [`
`633`	`633`	`self::intersect(new ArrayType(`
`634`	`634`	`self::union(...$keyTypesForGeneralArray),`
`635`		`- self::union(...$valueTypesForGeneralArray),`
	`635`	`+ self::union(...self::optimizeConstantArrays($valueTypesForGeneralArray)),`
`636`	`636`	`), ...$accessoryTypes),`
`637`	`637`	`];`
`638`	`638`	`}`