Fix #485 when return type is a generator

2024-11-30 04:39:00 +01:00 · 2018-02-07 22:29:32 -05:00 · 2018-02-07 22:29:32 -05:00 · 24e03edefa
commit 24e03edefa
parent 1ae58f0386
2 changed files with 13 additions and 0 deletions
--- a/src/Psalm/Checker/Statements/ReturnChecker.php
+++ b/src/Psalm/Checker/Statements/ReturnChecker.php
@ -235,6 +235,7 @@ class ReturnChecker
            } else {
                if ($storage->signature_return_type
                    && !$storage->signature_return_type->isVoid()
+                    && !$storage->signature_return_type->isGenerator()
                ) {
                    if (IssueBuffer::accepts(
                        new InvalidReturnStatement(
--- a/tests/Php70Test.php
+++ b/tests/Php70Test.php
@ -271,6 +271,18 @@ class Php70Test extends TestCase
                        new B();
                    }',
            ],
+            'generatorVoidReturn' => [
+                '<?php
+                    /**
+                     * @return Generator
+                     */
+                    function generator2() : Generator {
+                        if (rand(0,1)) {
+                            return;
+                        }
+                        yield 2;
+                    }',
+            ]
        ];
    }