Merge remote-tracking branch 'origin/6.x'

Author: danog

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.x-dev@2b0ff73c8bed091af231a0a80ac109126c92083a">
+<files psalm-version="6.x-dev@bbd217fc98c0daa0a13aea2a7f119d03ba3fc9a0">
   <file src="examples/TemplateChecker.php">
     <PossiblyUndefinedIntArrayOffset>
       <code><![CDATA[$comment_block->tags['variablesfrom'][0]]]></code>
@@ -1653,6 +1653,9 @@
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[end($path_types)]]></code>
     </RiskyTruthyFalsyComparison>
+    <UnnecessaryVarAnnotation>
+      <code><![CDATA[DataFlowNode]]></code>
+    </UnnecessaryVarAnnotation>
   </file>
   <file src="src/Psalm/Internal/Composer.php">
     <RiskyTruthyFalsyComparison>

src/Psalm/Internal/Codebase/TaintFlowGraph.php

@@ -35,6 +35,12 @@
 use Psalm\Type\TaintKind;
 use Webmozart\Assert\Assert;
 
+use function array_diff;
+use function array_filter;
+use function array_intersect;
+use function array_merge;
+use function array_unique;
+use function array_unshift;
 use function count;
 use function end;
 use function json_encode;
@@ -185,23 +191,23 @@ public function getSuccessorPath(DataFlowNode $sink): string
      */
     public function getIssueTrace(DataFlowNode $source): array
     {
-        $previous_source = $source->taintSource;
-        $path_types = $source->path_types;
-        $node = [
-            'location' => $source->code_location,
-            'label' => $source->label,
-            'entry_path_type' => end($path_types) ?: '',
-        ];
-
-        if ($previous_source) {
+        $out = [];
+        do {
+            /** @var DataFlowNode $source */
+            $previous_source = $source->taintSource;
             if ($previous_source === $source) {
-                return [];
+                break;
             }
-
-            return [...$this->getIssueTrace($previous_source), $node];
-        }
-
-        return [$node];
+            $path_types = $source->path_types;
+            array_unshift($out, [
+                'location' => $source->code_location,
+                'label' => $source->label,
+                'entry_path_type' => end($path_types) ?: '',
+            ]);
+            $source = $previous_source;
+        } while ($previous_source);
+
+        return $out;
     }
 
     public function connectSinksAndSources(Progress $progress): void