Tmp

Author: danog

src/Psalm/Internal/Codebase/TaintFlowGraph.php

@@ -310,6 +310,9 @@ public function connectSinksAndSources(Progress $progress): void
                     if ($specialized_calls) {
                         // If processing descendants of a specialized call, accept only descendants.
                         foreach ($this->specializations[$source->id] as $specialization => $specialized_id) {
+                            if (!isset($this->forward_edges[$specialized_id])) {
+                                continue;
+                            }
                             if (!isset($specialized_calls[$specialization])) {
                                 continue;
                             }
@@ -342,6 +345,9 @@ public function connectSinksAndSources(Progress $progress): void
                     } else {
                         // If not processing descendants, accept all specializations.
                         foreach ($this->specializations[$source->id] as $specialization => $specialized_id) {
+                            if (!isset($this->forward_edges[$specialized_id])) {
+                                continue;
+                            }
                             $new_source = new DataFlowNode(
                                 $specialized_id,
                                 $source->id,

src/Psalm/Internal/DataFlow/DataFlowNode.php

@@ -92,17 +92,12 @@ public static function getForAssignment(
         CodeLocation $assignment_location,
         ?string $specialization_key = null,
     ): self {
-        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;
-        }
+        $label = $var_id;
+        $var_id .= ':' . $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);
+        return self::make($var_id, $label, $assignment_location, $specialization_key);
     }
 
     public static function getForMethodReturn(