fix data collector

rekalogika · Feb 19, 2024 · ff6eb1e · ff6eb1e
1 parent 20bfba9
commit ff6eb1e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/Debug/TraceData.php b/src/Debug/TraceData.php
@@ -108,6 +108,14 @@ public function getNestedTraceData(): array
         return $this->nestedTraceData;
     }
 
+    /**
+     * @return array<int,self>
+     */
+    public function getAcceptedNestedTraceData(): array
+    {
+        return array_filter($this->nestedTraceData, fn (self $traceData) => !$traceData->isRefused());
+    }
+
     public function addNestedTraceData(self $traceData): void
     {
         $this->nestedTraceData[] = $traceData;
@@ -141,8 +149,7 @@ public function getPossibleTargetTypesHtml(): string
         if ($this->possibleTargetTypes === null) {
             return "__unknown__";
         }
-        return TypeUtil::getTypeStringHtml($this->possibleTargetTypes);
-        ;
+        return TypeUtil::getTypeStringHtml($this->possibleTargetTypes);;
     }
 
     public function getSelectedTargetType(): ?Type

diff --git a/src/Debug/TraceableTransformer.php b/src/Debug/TraceableTransformer.php
@@ -104,10 +104,7 @@ public function transform(
                 $caller['type'] ?? null
             );
 
-            // if we are the root transformer, add the trace data to the
-            // context, and collect it
             $context = $context->with($traceData);
-            $this->dataCollector->collectTraceData($traceData);
         }
 
         try {
@@ -118,6 +115,10 @@ public function transform(
 
             $traceData->finalize($time, $result);
 
+            if (!$parentTraceData) {
+                $this->dataCollector->collectTraceData($traceData);
+            }
+
             return $result;
         } catch (RefuseToTransformException $e) {
             $traceData->refusedToTransform();

diff --git a/templates/data_collector.html.twig b/templates/data_collector.html.twig
@@ -231,7 +231,7 @@
         </td>
     </tr>
 
-    {% for child in tracedata.nestedTraceData %}
+    {% for child in tracedata.acceptedNestedTraceData %}
         {{ _self.render_row(child, depth + 1) }}
     {% endfor %}
 {% endmacro %}