[TomasVotruba]

Problem

RemoveSuperfluousReturnNameFixer wrongly strips the condition variable of a PHPStan conditional @return type, corrupting the docblock:

-     * @return $arrayHydration ? array<int, array<string, mixed>> : array<int, LeadList>
+     * @return ? array<int, array<string, mixed>> : array<int, LeadList>

The $arrayHydration is the condition of a conditional return type, not a superfluous variable name.

Fix

Skip @return lines where the variable is immediately followed by ? or is (the conditional type forms $var ? A : B and $var is X ? A : B). Applied to both the PHP fixer and the Go (blink) port, with tests in each.