Merge pull request #6828 from orklah/function-un-unevaluated

allow declaring functions and classLikes after a never-returning call
vimeo · Nov 5, 2021 · 603fa65 · 603fa65
2 parents 9651daf + f4f9bd6
commit 603fa65
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php b/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
@@ -344,6 +344,10 @@ private static function analyzeStatement(
             && !$context->collect_mutations
             && !($stmt instanceof PhpParser\Node\Stmt\Nop)
             && !($stmt instanceof PhpParser\Node\Stmt\InlineHTML)
+            && !($stmt instanceof PhpParser\Node\Stmt\Function_)
+            && !($stmt instanceof PhpParser\Node\Stmt\Class_)
+            && !($stmt instanceof PhpParser\Node\Stmt\Interface_)
+            && !($stmt instanceof PhpParser\Node\Stmt\Trait_)
         ) {
             if ($codebase->find_unused_variables) {
                 if (IssueBuffer::accepts(

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -1056,6 +1056,19 @@ function f(): int
                     `$used`;
                 ',
             ],
+            'notUnevaluatedFunction' => [
+                '<?php
+                    /** @return never */
+                    function neverReturns(){
+                        die();
+                    }
+                    unrelated();
+                    neverReturns();
+
+                    function unrelated():void{
+                        echo "hello";
+                    }',
+            ],
         ];
     }