cs-fix

Author: danog

src/Psalm/Internal/Analyzer/Statements/EchoAnalyzer.php

@@ -66,7 +66,7 @@ public static function analyze(
                     TaintKind::INPUT_HTML
                         | TaintKind::INPUT_HAS_QUOTES
                         | TaintKind::USER_SECRET
-                        | TaintKind::SYSTEM_SECRET
+                        | TaintKind::SYSTEM_SECRET,
                 );
 
 

src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php

@@ -375,7 +375,7 @@ public static function taintReturnType(
                 $cased_method_id,
                 $method_storage->signature_return_type_location ?: $method_storage->location,
                 null,
-                $method_storage->taint_source_types
+                $method_storage->taint_source_types,
             );
 
             $statements_analyzer->data_flow_graph->addSource($method_node);

src/Psalm/Internal/Analyzer/Statements/Expression/ExitAnalyzer.php

@@ -78,7 +78,7 @@ public static function analyze(
                     TaintKind::INPUT_HTML
                         | TaintKind::INPUT_HAS_QUOTES
                         | TaintKind::USER_SECRET
-                        | TaintKind::SYSTEM_SECRET
+                        | TaintKind::SYSTEM_SECRET,
                 );
 
                 $statements_analyzer->data_flow_graph->addSink($echo_param_sink);

src/Psalm/Internal/Analyzer/Statements/Expression/IncludeAnalyzer.php

@@ -122,7 +122,7 @@ public static function analyze(
                 0,
                 $arg_location,
                 $arg_location,
-                TaintKind::INPUT_INCLUDE
+                TaintKind::INPUT_INCLUDE,
             );
 
             $statements_analyzer->data_flow_graph->addSink($include_param_sink);

src/Psalm/Internal/Analyzer/Statements/Expression/PrintAnalyzer.php

@@ -48,7 +48,7 @@ public static function analyze(
                 TaintKind::INPUT_HTML
                     | TaintKind::INPUT_HAS_QUOTES
                     | TaintKind::USER_SECRET
-                    | TaintKind::SYSTEM_SECRET
+                    | TaintKind::SYSTEM_SECRET,
             );
 
             $statements_analyzer->data_flow_graph->addSink($print_param_sink);

src/Psalm/Internal/Analyzer/StatementsAnalyzer.php

@@ -39,6 +39,7 @@
 use Psalm\Internal\Analyzer\Statements\UnsetAnalyzer;
 use Psalm\Internal\Analyzer\Statements\UnusedAssignmentRemover;
 use Psalm\Internal\Codebase\DataFlowGraph;
+use Psalm\Internal\Codebase\TaintFlowGraph;
 use Psalm\Internal\Codebase\VariableUseGraph;
 use Psalm\Internal\DataFlow\DataFlowNode;
 use Psalm\Internal\FileManipulation\FileManipulationBuffer;
@@ -154,11 +155,29 @@ public function __construct(protected SourceAnalyzer $source, public NodeDataPro
         $this->file_analyzer = $source->getFileAnalyzer();
         $this->codebase = $source->getCodebase();
 
-        if (!$this->codebase->taint_flow_graph && $this->codebase->find_unused_variables) {
+        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
+            && $this->codebase->config->trackTaintsInPath($this->getFilePath())
+        ) {
+            $this->data_flow_graph = $this->codebase->taint_flow_graph;
+        } else {
+            $this->data_flow_graph = null;
+        }
+
+        return $old;
+    }
+
     /**
      * Checks an array of statements for validity
      *
@@ -177,16 +196,9 @@ public function analyze(
         // hoist functions to the top
         $this->hoistFunctions($stmts, $context);
 
-        $project_analyzer = $this->getFileAnalyzer()->project_analyzer;
-        $codebase = $project_analyzer->getCodebase();
+        $codebase = $this->codebase;
 
-        if ($this->codebase->taint_flow_graph) {
-            if ($root_scope && $codebase->config->trackTaintsInPath($this->getFilePath())) {
-                $this->data_flow_graph = $this->codebase->taint_flow_graph;
-            } else {
-                $this->data_flow_graph = null;
-            }
-        }
+        $prev = $this->initTaintFlowGraph($root_scope);
 
         if ($codebase->config->hoist_constants) {
             self::hoistConstants($this, $stmts, $context);
@@ -219,6 +231,8 @@ public function analyze(
             }
         }
 
+        $this->data_flow_graph = $prev;
+
         return null;
     }
 

src/Psalm/Internal/Codebase/TaintFlowGraph.php

@@ -286,7 +286,7 @@ public function connectSinksAndSources(Progress $progress): void
                         $source->taints,
                         $source->taintSource,
                         $source->path_types,
-                        $specialized_calls
+                        $specialized_calls,
                     );
 
                     $this->getChildNodes(
@@ -620,7 +620,7 @@ private function getChildNodes(
                 $new_taints,
                 $generated_source,
                 $path_types,
-                $generated_source->specialized_calls
+                $generated_source->specialized_calls,
             );
 
             $new_sources[$key] = $new_destination;

src/Psalm/Internal/Codebase/VariableUseGraph.php

@@ -193,7 +193,7 @@ private function getChildNodes(
                 null,
                 0,
                 null,
-                $path_types
+                $path_types,
             );
 
             $new_child_nodes[$to_id] = $new_destination;

src/Psalm/Internal/DataFlow/DataFlowNode.php

@@ -6,7 +6,6 @@
 
 use Override;
 use Psalm\CodeLocation;
-use Psalm\Storage\ImmutableNonCloneableTrait;
 use Stringable;
 
 use function strtolower;
@@ -30,7 +29,7 @@ public function __construct(
         /**
          * @var array<string, array<string, string>>
          */
-        public readonly array $specialized_calls = [],    
+        public readonly array $specialized_calls = [],
     ) {
     }
 
@@ -43,7 +42,7 @@ public static function make(
         string $label,
         ?CodeLocation $code_location,
         ?string $specialization_key = null,
-        int $taints = 0
+        int $taints = 0,
     ): self {
         if ($specialization_key === null) {
             $unspecialized_id = null;
@@ -57,7 +56,7 @@ public static function make(
             $specialization_key,
             $label,
             $code_location,
-            $taints
+            $taints,
         );
     }
 
@@ -91,11 +90,17 @@ public static function getForMethodArgument(
     public static function getForAssignment(
         string $var_id,
         CodeLocation $assignment_location,
-        string $specialization_key = '',
+        ?string $specialization_key = null,
     ): self {
-        $specialization_key .= '-' . $assignment_location->file_name
-            . ':' . $assignment_location->raw_file_start
-            . '-' . $assignment_location->raw_file_end;
+        if ($specialization_key === null) {
+            $specialization_key = $assignment_location->file_name
+                . ':' . $assignment_location->raw_file_start
+                . '-' . $assignment_location->raw_file_end;
+        } else {
+            $specialization_key .= '-' . $assignment_location->file_name
+                . ':' . $assignment_location->raw_file_start
+                . '-' . $assignment_location->raw_file_end;
+        }
 
         return self::make($var_id, $var_id, $assignment_location, $specialization_key);
     }
@@ -105,7 +110,7 @@ public static function getForMethodReturn(
         string $cased_method_id,
         ?CodeLocation $code_location,
         ?CodeLocation $function_location = null,
-        int $taints = 0
+        int $taints = 0,
     ): self {
         $specialization_key = null;
 
@@ -153,7 +158,7 @@ public function setTaints(int $taints): self
             $taints,
             $this->taintSource,
             $this->path_types,
-            $this->specialized_calls
+            $this->specialized_calls,
         );
     }