Introduce filterTypes

Author: VincentLanglet

src/Analyser/MutatingScope.php

@@ -5594,18 +5594,10 @@ private function exactInstantiation(New_ $node, string $className): ?Type
 	private function filterTypeWithMethod(Type $typeWithMethod, string $methodName): ?Type
 	{
 		if ($typeWithMethod instanceof UnionType) {
-			$newTypes = [];
-			foreach ($typeWithMethod->getTypes() as $innerType) {
-				if (!$innerType->hasMethod($methodName)->yes()) {
-					continue;
-				}
-
-				$newTypes[] = $innerType;
-			}
-			if (count($newTypes) === 0) {
+			$typeWithMethod = $typeWithMethod->filterTypes(fn (Type $innerType) => $innerType->hasMethod($methodName)->yes());
+			if ($typeWithMethod === null) {
 				return null;
 			}
-			$typeWithMethod = TypeCombinator::union(...$newTypes);
 		}
 
 		if (!$typeWithMethod->hasMethod($methodName)->yes()) {
@@ -5709,18 +5701,10 @@ private function methodCallReturnType(Type $typeWithMethod, string $methodName,
 	public function getPropertyReflection(Type $typeWithProperty, string $propertyName): ?ExtendedPropertyReflection
 	{
 		if ($typeWithProperty instanceof UnionType) {
-			$newTypes = [];
-			foreach ($typeWithProperty->getTypes() as $innerType) {
-				if (!$innerType->hasProperty($propertyName)->yes()) {
-					continue;
-				}
-
-				$newTypes[] = $innerType;
-			}
-			if (count($newTypes) === 0) {
+			$typeWithProperty = $typeWithProperty->filterTypes(fn (Type $innerType) => $innerType->hasProperty($propertyName)->yes());
+			if ($typeWithProperty === null) {
 				return null;
 			}
-			$typeWithProperty = TypeCombinator::union(...$newTypes);
 		}
 		if (!$typeWithProperty->hasProperty($propertyName)->yes()) {
 			return null;
@@ -5749,18 +5733,10 @@ private function propertyFetchType(Type $fetchedOnType, string $propertyName, Ex
 	public function getConstantReflection(Type $typeWithConstant, string $constantName): ?ConstantReflection
 	{
 		if ($typeWithConstant instanceof UnionType) {
-			$newTypes = [];
-			foreach ($typeWithConstant->getTypes() as $innerType) {
-				if (!$innerType->hasConstant($constantName)->yes()) {
-					continue;
-				}
-
-				$newTypes[] = $innerType;
-			}
-			if (count($newTypes) === 0) {
+			$typeWithConstant = $typeWithConstant->filterTypes(fn (Type $innerType) => $innerType->hasConstant($constantName)->yes());
+			if ($typeWithConstant === null) {
 				return null;
 			}
-			$typeWithConstant = TypeCombinator::union(...$newTypes);
 		}
 		if (!$typeWithConstant->hasConstant($constantName)->yes()) {
 			return null;
@@ -5804,18 +5780,7 @@ private function getNativeConstantTypes(): array
 	public function getIterableKeyType(Type $iteratee): Type
 	{
 		if ($iteratee instanceof UnionType) {
-			$newTypes = [];
-			foreach ($iteratee->getTypes() as $innerType) {
-				if (!$innerType->isIterable()->yes()) {
-					continue;
-				}
-
-				$newTypes[] = $innerType;
-			}
-			if (count($newTypes) === 0) {
-				return $iteratee->getIterableKeyType();
-			}
-			$iteratee = TypeCombinator::union(...$newTypes);
+			$iteratee = $iteratee->filterTypes(fn (Type $innerType) => $innerType->isIterable()->yes()) ?? $iteratee;
 		}
 
 		return $iteratee->getIterableKeyType();
@@ -5824,18 +5789,7 @@ public function getIterableKeyType(Type $iteratee): Type
 	public function getIterableValueType(Type $iteratee): Type
 	{
 		if ($iteratee instanceof UnionType) {
-			$newTypes = [];
-			foreach ($iteratee->getTypes() as $innerType) {
-				if (!$innerType->isIterable()->yes()) {
-					continue;
-				}
-
-				$newTypes[] = $innerType;
-			}
-			if (count($newTypes) === 0) {
-				return $iteratee->getIterableValueType();
-			}
-			$iteratee = TypeCombinator::union(...$newTypes);
+			$iteratee = $iteratee->filterTypes(fn (Type $innerType) => $innerType->isIterable()->yes()) ?? $iteratee;
 		}
 
 		return $iteratee->getIterableValueType();

src/Type/UnionType.php

@@ -86,6 +86,28 @@ public function getTypes(): array
 		return $this->types;
 	}
 
+	/**
+	 * @param callable(Type $type): bool $filterCb
+	 *
+	 * @return Type|null
+	 */
+	public function filterTypes(callable $filterCb): ?Type
+	{
+		$newTypes = [];
+		foreach ($this->getTypes() as $innerType) {
+			if (!$filterCb($innerType)) {
+				continue;
+			}
+
+			$newTypes[] = $innerType;
+		}
+		if (count($newTypes) === 0) {
+			return null;
+		}
+
+		return TypeCombinator::union(...$newTypes);
+	}
+
 	public function isNormalized(): bool
 	{
 		return $this->normalized;