Make ParametersAcceptorSelector::selectSingle() return union-ed conditional types

Author: rvanvelzen

src/Reflection/FunctionVariant.php

@@ -4,9 +4,10 @@
 
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeUtils;
 
 /** @api */
-class FunctionVariant implements ParametersAcceptor
+class FunctionVariant implements ParametersAcceptor, SingleParametersAcceptor
 {
 
 	/**
@@ -51,4 +52,21 @@ public function getReturnType(): Type
 		return $this->returnType;
 	}
 
+	/**
+	 * @return static
+	 */
+	public function flattenConditionalsInReturnType(): SingleParametersAcceptor
+	{
+		/** @var static $result */
+		$result = new self(
+			$this->templateTypeMap,
+			$this->resolvedTemplateTypeMap,
+			$this->parameters,
+			$this->isVariadic,
+			TypeUtils::flattenConditionals($this->returnType),
+		);
+
+		return $result;
+	}
+
 }

src/Reflection/FunctionVariantWithPhpDocs.php

@@ -4,6 +4,7 @@
 
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeUtils;
 
 /** @api */
 class FunctionVariantWithPhpDocs extends FunctionVariant implements ParametersAcceptorWithPhpDocs
@@ -53,4 +54,23 @@ public function getNativeReturnType(): Type
 		return $this->nativeReturnType;
 	}
 
+	/**
+	 * @return static
+	 */
+	public function flattenConditionalsInReturnType(): SingleParametersAcceptor
+	{
+		/** @var static $result */
+		$result = new self(
+			$this->getTemplateTypeMap(),
+			$this->getResolvedTemplateTypeMap(),
+			$this->getParameters(),
+			$this->isVariadic(),
+			TypeUtils::flattenConditionals($this->getReturnType()),
+			TypeUtils::flattenConditionals($this->phpDocReturnType),
+			$this->nativeReturnType,
+		);
+
+		return $result;
+	}
+
 }

src/Reflection/ParametersAcceptorSelector.php

@@ -48,7 +48,13 @@ public static function selectSingle(
 			throw new ShouldNotHappenException('Multiple variants - use selectFromArgs() instead.');
 		}
 
-		return $parametersAcceptors[0];
+		$parametersAcceptor = $parametersAcceptors[0];
+
+		if ($parametersAcceptor instanceof SingleParametersAcceptor) {
+			$parametersAcceptor = $parametersAcceptor->flattenConditionalsInReturnType();
+		}
+
+		return $parametersAcceptor;
 	}
 
 	/**

src/Reflection/ResolvedFunctionVariant.php

@@ -8,10 +8,11 @@
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
+use PHPStan\Type\TypeUtils;
 use function array_key_exists;
 use function array_map;
 
-class ResolvedFunctionVariant implements ParametersAcceptor
+class ResolvedFunctionVariant implements ParametersAcceptor, SingleParametersAcceptor
 {
 
 	/** @var ParameterReflection[]|null */
@@ -88,6 +89,22 @@ public function getReturnType(): Type
 		return $type;
 	}
 
+	/**
+	 * @return static
+	 */
+	public function flattenConditionalsInReturnType(): SingleParametersAcceptor
+	{
+		/** @var static $result */
+		$result = new self(
+			$this->parametersAcceptor,
+			$this->resolvedTemplateTypeMap,
+			$this->passedArgs,
+		);
+		$result->returnType = TypeUtils::flattenConditionals($this->getReturnType());
+
+		return $result;
+	}
+
 	private function resolveConditionalTypes(Type $type): Type
 	{
 		return TypeTraverser::map($type, function (Type $type, callable $traverse): Type {

src/Reflection/SingleParametersAcceptor.php

@@ -0,0 +1,13 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Reflection;
+
+interface SingleParametersAcceptor
+{
+
+	/**
+	 * @return static
+	 */
+	public function flattenConditionalsInReturnType(): self;
+
+}

src/Type/ConditionalType.php

@@ -91,7 +91,7 @@ private function resolve(): Type
 		}
 
 		if ($this->isResolved()) {
-			return TypeCombinator::union($this->if, $this->else);
+			return $this->getResult();
 		}
 
 		return $this;

src/Type/Traits/ConditionalTypeTrait.php

@@ -288,7 +288,7 @@ public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
 		return $otherType->isSmallerThanOrEqual($result);
 	}
 
-	private function getResult(): Type
+	public function getResult(): Type
 	{
 		if ($this->result === null) {
 			return $this->result = TypeCombinator::union($this->if, $this->else);

src/Type/TypeUtils.php

@@ -328,4 +328,15 @@ public static function containsCallable(Type $type): bool
 		return false;
 	}
 
+	public static function flattenConditionals(Type $type): Type
+	{
+		return TypeTraverser::map($type, static function (Type $type, callable $traverse) {
+			while ($type instanceof ConditionalType || $type instanceof ConditionalTypeForParameter) {
+				$type = $type->getResult();
+			}
+
+			return $traverse($type);
+		});
+	}
+
 }

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -622,7 +622,7 @@ public function testBug6896(): void
 		}
 
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-6896.php');
-		$this->assertCount(4, $errors);
+		$this->assertCount(2, $errors);
 	}
 
 	public function testBug6940(): void

tests/PHPStan/Analyser/DynamicReturnTypeExtensionTypeInferenceTest.php

@@ -11,6 +11,7 @@ public function dataAsserts(): iterable
 	{
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-types.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-compound-types.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/dynamic-method-return-getsingle-conditional.php');
 	}
 
 	/**