Merge pull request #6790 from orklah/fix_yield

vimeo · Nov 1, 2021 · 81ca05f · 81ca05f
2 parents ea5b9bb + c5c779c
commit 81ca05f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeCollector.php b/src/Psalm/Internal/Analyzer/FunctionLike/ReturnTypeCollector.php
@@ -343,7 +343,8 @@ protected static function getYieldTypeFromExpression(
 
         if ($stmt instanceof PhpParser\Node\Expr\MethodCall
             || $stmt instanceof PhpParser\Node\Expr\FuncCall
-            || $stmt instanceof PhpParser\Node\Expr\StaticCall) {
+            || $stmt instanceof PhpParser\Node\Expr\StaticCall
+            || $stmt instanceof PhpParser\Node\Expr\New_) {
             $yield_types = [];
 
             foreach ($stmt->getArgs() as $arg) {

diff --git a/tests/GeneratorTest.php b/tests/GeneratorTest.php
@@ -286,6 +286,15 @@ function generator(): Generator
                     '$iterator' => 'NoRewindIterator<int, string>',
                 ]
             ],
+            'detectYieldInNew' => [
+                '<?php
+                    /** @psalm-suppress MissingClosureReturnType */
+                    $_a = function() { return new RuntimeException(yield "a"); };
+                    ',
+                'assertions' => [
+                    '$_a' => 'pure-Closure():Generator<int, "a", mixed, RuntimeException>',
+                ]
+            ],
         ];
     }