Fixes

Author: danog

examples/TemplateChecker.php

@@ -178,6 +178,7 @@ private function checkWithViewClass(Context $context, array $stmts): void
         $statements_source = new StatementsAnalyzer(
             $view_method_analyzer,
             new NodeDataProvider(),
+            false,
         );
 
         $statements_source->analyze($pseudo_method_stmts, $context);

src/Psalm/Internal/Analyzer/AttributesAnalyzer.php

@@ -212,6 +212,7 @@ private static function analyzeAttributeConstruction(
         $statements_analyzer = new StatementsAnalyzer(
             $source,
             new NodeDataProvider(),
+            false,
         );
         $statements_analyzer->addSuppressedIssues(array_values($suppressed_issues));
 

src/Psalm/Internal/Analyzer/ClassAnalyzer.php

@@ -561,8 +561,8 @@ public function analyze(
             }
         }
 
-        $statements_analyzer = new StatementsAnalyzer($this, new NodeDataProvider());
-        $statements_analyzer->analyze($member_stmts, $class_context, $global_context, true);
+        $statements_analyzer = new StatementsAnalyzer($this, new NodeDataProvider(), true);
+        $statements_analyzer->analyze($member_stmts, $class_context, $global_context);
 
         ClassConstAnalyzer::analyze($storage, $this->getCodebase());
 

src/Psalm/Internal/Analyzer/FileAnalyzer.php

@@ -162,7 +162,7 @@ public function analyze(
         $leftover_stmts = $this->populateCheckers($stmts);
 
         $this->node_data = new NodeDataProvider();
-        $statements_analyzer = new StatementsAnalyzer($this, $this->node_data);
+        $statements_analyzer = new StatementsAnalyzer($this, $this->node_data, true);
 
         foreach ($file_storage->docblock_issues as $docblock_issue) {
             IssueBuffer::maybeAdd($docblock_issue);
@@ -171,7 +171,7 @@ public function analyze(
         // if there are any leftover statements, evaluate them,
         // in turn causing the classes/interfaces be evaluated
         if ($leftover_stmts) {
-            $statements_analyzer->analyze($leftover_stmts, $this->context, $global_context, true);
+            $statements_analyzer->analyze($leftover_stmts, $this->context, $global_context);
 
             foreach ($leftover_stmts as $leftover_stmt) {
                 if ($leftover_stmt instanceof PhpParser\Node\Stmt\Return_) {

src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php

@@ -240,7 +240,7 @@ public function analyze(
             $this->is_static = true;
         }
 
-        $statements_analyzer = new StatementsAnalyzer($this, $type_provider);
+        $statements_analyzer = new StatementsAnalyzer($this, $type_provider, true);
 
         $byref_uses = [];
         if ($this instanceof ClosureAnalyzer && $this->function instanceof Closure) {
@@ -505,7 +505,7 @@ public function analyze(
             $statements_analyzer->addSuppressedIssues(['NoValue']);
         }
 
-        $statements_analyzer->analyze($function_stmts, $context, $global_context, true);
+        $statements_analyzer->analyze($function_stmts, $context, $global_context);
 
         if ($codebase->alter_code
             && isset($project_analyzer->getIssuesToFix()['MissingPureAnnotation'])

src/Psalm/Internal/Analyzer/InterfaceAnalyzer.php

@@ -221,8 +221,8 @@ public function analyze(): void
 
         MethodComparator::comparePseudoMethods($pseudo_methods, $this->fq_class_name, $codebase, $class_storage);
 
-        $statements_analyzer = new StatementsAnalyzer($this, new NodeDataProvider());
-        $statements_analyzer->analyze($member_stmts, $interface_context, null, true);
+        $statements_analyzer = new StatementsAnalyzer($this, new NodeDataProvider(), true);
+        $statements_analyzer->analyze($member_stmts, $interface_context, null);
 
         ClassConstAnalyzer::analyze($this->storage, $this->getCodebase());
     }

src/Psalm/Internal/Analyzer/NamespaceAnalyzer.php

@@ -77,7 +77,7 @@ public function collectAnalyzableInformation(): void
         }
 
         if ($leftover_stmts) {
-            $statements_analyzer = new StatementsAnalyzer($this, new NodeDataProvider());
+            $statements_analyzer = new StatementsAnalyzer($this, new NodeDataProvider(), true);
             $file_context = $this->source->context;
 
             if ($file_context !== null) {
@@ -88,7 +88,7 @@ public function collectAnalyzableInformation(): void
                 $context->defineGlobals();
                 $context->collect_exceptions = $codebase->config->check_for_throws_in_global_scope;
             }
-            $statements_analyzer->analyze($leftover_stmts, $context, null, true);
+            $statements_analyzer->analyze($leftover_stmts, $context);
         }
     }
 

src/Psalm/Internal/Analyzer/StatementsAnalyzer.php

@@ -150,32 +150,19 @@ final class StatementsAnalyzer extends SourceAnalyzer
      */
     public array $foreach_var_locations = [];
 
-    public function __construct(protected SourceAnalyzer $source, public NodeDataProvider $node_data)
+    public function __construct(protected SourceAnalyzer $source, public NodeDataProvider $node_data, private readonly bool $root_scope)
     {
         $this->file_analyzer = $source->getFileAnalyzer();
         $this->codebase = $source->getCodebase();
 
-        if ($this->codebase->taint_flow_graph) {
-            $this->initTaintFlowGraph(true);
-        } elseif ($this->codebase->find_unused_variables) {
-            $this->data_flow_graph = new VariableUseGraph();
-        }
-    }
-
-    private function initTaintFlowGraph(bool $enable): ?TaintFlowGraph
-    {
-        $old = $this->data_flow_graph;
-
-        if ($enable
-            && $this->codebase->taint_flow_graph
+        if ($this->codebase->taint_flow_graph
+            && $root_scope
             && $this->codebase->config->trackTaintsInPath($this->getFilePath())
         ) {
             $this->data_flow_graph = $this->codebase->taint_flow_graph;
-        } else {
-            $this->data_flow_graph = null;
+        } elseif ($this->codebase->find_unused_variables) {
+            $this->data_flow_graph = new VariableUseGraph();
         }
-
-        return $old;
     }
 
     /**
@@ -188,7 +175,6 @@ public function analyze(
         array $stmts,
         Context $context,
         ?Context $global_context = null,
-        bool $root_scope = false,
     ): ?bool {
         if (!$stmts) {
             return null;
@@ -198,8 +184,6 @@ public function analyze(
 
         $codebase = $this->codebase;
 
-        $prev = $this->initTaintFlowGraph($root_scope);
-
         if ($codebase->config->hoist_constants) {
             self::hoistConstants($this, $stmts, $context);
         }
@@ -210,7 +194,7 @@ public function analyze(
             }
         }
 
-        if ($root_scope
+        if ($this->root_scope
             && !$context->collect_initializations
             && !$context->collect_mutations
             && $codebase->find_unused_variables
@@ -219,7 +203,7 @@ public function analyze(
             $this->checkUnreferencedVars($stmts, $context);
         }
 
-        if ($codebase->alter_code && $root_scope && $this->vars_to_initialize) {
+        if ($codebase->alter_code && $this->root_scope && $this->vars_to_initialize) {
             $file_contents = $codebase->getFileContents($this->getFilePath());
 
             foreach ($this->vars_to_initialize as $var_id => $branch_point) {
@@ -231,8 +215,6 @@ public function analyze(
             }
         }
 
-        $this->data_flow_graph = $prev;
-
         return null;
     }
 

tests/AlgebraTest.php

@@ -113,7 +113,7 @@ public function testCombinatorialExpansion(): void
 
         $file_analyzer = new FileAnalyzer($this->project_analyzer, 'somefile.php', 'somefile.php');
         $file_analyzer->context = new Context();
-        $statements_analyzer = new StatementsAnalyzer($file_analyzer, new NodeDataProvider());
+        $statements_analyzer = new StatementsAnalyzer($file_analyzer, new NodeDataProvider(), false);
 
         $dnf_clauses = FormulaGenerator::getFormula(
             spl_object_id($dnf_stmt->expr),

tests/TypeReconciliation/ReconcilerTest.php

@@ -56,6 +56,7 @@ public function setUp(): void
         $this->statements_analyzer = new StatementsAnalyzer(
             $this->file_analyzer,
             new NodeDataProvider(),
+            false,
         );
 
         $this->addFile('newfile.php', '