Fix QueryCollector

Author: erikn69

src/DataCollector/QueryCollector.php

@@ -16,6 +16,7 @@ class QueryCollector extends PDOCollector
     protected $timeCollector;
     protected $queries = [];
     protected $queryCount = 0;
+    protected $transactionEventsCount = 0;
     protected $softLimit = null;
     protected $hardLimit = null;
     protected $lastMemoryUsage;
@@ -439,6 +440,7 @@ protected function getTwigInfo($trace)
      */
     public function collectTransactionEvent($event, $connection)
     {
+        $this->transactionEventsCount++;
         $source = [];
 
         if ($this->findSource) {
@@ -484,6 +486,11 @@ public function collect()
         $statements = [];
         foreach ($queries as $query) {
             $source = reset($query['source']);
+            $normalizedPath = is_object($source) ? $this->normalizeFilePath($source->file ?: '') : '';
+            if ($query['type'] != 'transaction' && Str::startsWith($normalizedPath, $this->excludePaths)) {
+                continue;
+            }
+
             $totalTime += $query['time'];
             $totalMemory += $query['memory'];
 
@@ -497,11 +504,6 @@ public function collect()
                 default => false,
             };
 
-            $source = $this->getDataFormatter()->formatSource($source);
-            if (Str::startsWith($source, $this->excludePaths)) {
-                continue;
-            }
-
             $statements[] = [
                 'sql' => $this->getSqlQueryToDisplay($query),
                 'type' => $query['type'],
@@ -517,7 +519,7 @@ public function collect()
                 'memory_str' => $query['memory'] ? $this->getDataFormatter()->formatBytes($query['memory']) : null,
                 'filename' => $this->getDataFormatter()->formatSource($source, true),
                 'source' => $source,
-                'xdebug_link' => is_object($source) ? $this->getXdebugLink($source->file ?: '', $source->line) : null,
+                'xdebug_link' => is_object($source) ? $this->getXdebugLink($normalizedPath, $source->line) : null,
                 'connection' => $connectionName,
                 'explain' => $this->explainQuery && $canExplainQuery ? [
                     'url' => route('debugbar.queries.explain'),
@@ -580,7 +582,7 @@ public function collect()
         $data = [
             'nb_statements' => $this->queryCount,
             'nb_visible_statements' => count($statements),
-            'nb_excluded_statements' => $this->queryCount - count($statements),
+            'nb_excluded_statements' => $this->queryCount + $this->transactionEventsCount - count($statements),
             'nb_failed_statements' => 0,
             'accumulated_duration' => $totalTime,
             'accumulated_duration_str' => $this->formatDuration($totalTime),