Merge pull request #6825 from orklah/tmp-var-coalesce

create a tmp fake var for ternaries inside coalesce
vimeo · Nov 5, 2021 · e6c2313 · e6c2313
2 parents b783468 + ad57516
commit e6c2313
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/CoalesceAnalyzer.php
@@ -38,6 +38,7 @@ public static function analyze(
             || $root_expr instanceof PhpParser\Node\Expr\Cast
             || $root_expr instanceof PhpParser\Node\Expr\NullsafePropertyFetch
             || $root_expr instanceof PhpParser\Node\Expr\NullsafeMethodCall
+            || $root_expr instanceof PhpParser\Node\Expr\Ternary
         ) {
             $left_var_id = '$<tmp coalesce var>' . (int) $left_expr->getAttribute('startFilePos');
 

diff --git a/tests/BinaryOperationTest.php b/tests/BinaryOperationTest.php
@@ -700,6 +700,19 @@ function scope(array $a): int|float {
                     '$b' => 'float|int',
                 ],
             ],
+            'coalesceFilterOutNullEvenWithTernary' => [
+                '<?php
+
+                    interface FooInterface
+                    {
+                        public function toString(): ?string;
+                    }
+
+                    function example(object $foo): string
+                    {
+                        return ($foo instanceof FooInterface ? $foo->toString() : null) ?? "Not a stringable foo";
+                    }',
+            ],
         ];
     }