Merge pull request #7068 from klimick/fix-yield

Detect yield in array expression

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

@@ -355,6 +355,18 @@ class ReturnTypeCollector
             return $yield_types;
         }
 
+        if ($stmt instanceof PhpParser\Node\Expr\Array_) {
+            $yield_types = [];
+
+            foreach ($stmt->items as $item) {
+                if ($item instanceof PhpParser\Node\Expr\ArrayItem) {
+                    $yield_types = array_merge($yield_types, self::getYieldTypeFromExpression($item->value, $nodes));
+                }
+            }
+
+            return $yield_types;
+        }
+
         return [];
     }
 }

tests/GeneratorTest.php

@@ -298,6 +298,15 @@ class GeneratorTest extends TestCase
                     '$_a' => 'pure-Closure():Generator<int, "a", mixed, RuntimeException>',
                 ]
             ],
+            'detectYieldInArray' => [
+                '<?php
+                    /** @psalm-suppress MissingClosureReturnType */
+                    $_a = function() { return [yield "a"]; };
+                    ',
+                'assertions' => [
+                    '$_a' => 'pure-Closure():Generator<int, "a", mixed, array{"a"}>',
+                ]
+            ],
         ];
     }