Merge pull request #9519 from edsrzf/eval-inside-call

vimeo · Mar 15, 2023 · 70a024f · 70a024f
2 parents a11fd94 + ce3f7fc
commit 70a024f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/EvalAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/EvalAnalyzer.php
@@ -26,7 +26,10 @@ public static function analyze(
         PhpParser\Node\Expr\Eval_ $stmt,
         Context $context
     ): void {
+        $was_inside_call = $context->inside_call;
+        $context->inside_call = true;
         ExpressionAnalyzer::analyze($statements_analyzer, $stmt->expr, $context);
+        $context->inside_call = $was_inside_call;
 
         $codebase = $statements_analyzer->getCodebase();
 

diff --git a/tests/UnusedCodeTest.php b/tests/UnusedCodeTest.php
@@ -709,6 +709,10 @@ function takesMixed($i) : int {
                         return $i;
                     }',
             ],
+            'usedFunctionCallInEval' => [
+                'code' => '<?php
+                    eval(str_repeat("a", 10));',
+            ],
             'usedFunctionCallInsideSwitchWithTernary' => [
                 'code' => '<?php
                     function getArg(string $method) : void {

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -115,6 +115,13 @@ public function providerValidCodeParse(): array
 
                     unset($arr[$a]);',
             ],
+            'eval' => [
+                'code' => '<?php
+                    if (rand()) {
+                        $v = "";
+                        eval($v);
+                    }',
+            ],
             'usedVariables' => [
                 'code' => '<?php
                     /** @return string */