Psalm not inferring generator template parameters when using ternary

[danog]

https://psalm.dev/r/35d889bd48

The error for the function with the ternary does not contain the actual template parameters for \Generator.

[psalm-github-bot]

I found these snippets:

https://psalm.dev/r/35d889bd48

<?php

/** @psalm-yield int */
class a {}

/**
 * @return Generator<mixed, mixed, mixed, int>
 */
function a(): Generator {
	return random_int(0, 1) ? 123 : yield new a;
}

/**
 * @return Generator<mixed, mixed, mixed, int>
 */
function b(): Generator {
	return yield new a;
}

Psalm output (using commit 028ac7f):

INFO: MixedReturnTypeCoercion - 7:12 - The declared return type 'Generator<mixed, mixed, mixed, int>' for a is more specific than the inferred return type 'Generator'

INFO: MixedReturnTypeCoercion - 14:12 - The declared return type 'Generator<mixed, mixed, mixed, int>' for b is more specific than the inferred return type 'Generator<int, a, mixed, mixed>'

[orklah]

Pretty sure it should be handled here:

psalm/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeCollector.php

Line 303 in 87160c8

protected static function getYieldTypeFromExpression(

But this piece of code breaks my mind each time. It's a recursive method that collects every return type and yield type through each statement.

So it should have a Ternary handling somewhere (possibly around the place where we handle Ifs)