Fix rector error and cleanup up filename displays for Debug toolbar d…

…atabase tab.
codeigniter4 · Nov 17, 2021 · e97b95b · iprixi · Jan 4, 2022 · e97b95b
1 parent e33f146
commit e97b95b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
@@ -137,12 +137,17 @@ public function display(): array
             // Find the first line that doesn't include `system` in the backtrace
             $line = [];
 
-            foreach ($query['trace'] as $traceLine) {
-                if (strpos($traceLine['file'], 'system/') !== false) {
+            foreach ($query['trace'] as &$traceLine) {
+                // Clean up the file paths
+                $traceLine['file'] = str_ireplace(APPPATH, 'APPPATH/', $traceLine['file']);
+                $traceLine['file'] = str_ireplace(SYSTEMPATH, 'SYSTEMPATH/', $traceLine['file']);
+                $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
+                $traceLine['file'] = str_ireplace(ROOTPATH, 'ROOTPATH/', $traceLine['file']);
+
+                if (strpos($traceLine['file'], 'APPPATH') === false) {
                     continue;
                 }
-                $line = $traceLine;
-                break;
+                $line = empty($line) ? $traceLine : $line;
             }
 
             return [
@@ -153,7 +158,7 @@ public function display(): array
                 'trace'      => $query['trace'],
                 'trace-file' => str_replace(ROOTPATH, '/', $line['file'] ?? ''),
                 'trace-line' => $line['line'] ?? '',
-                'qid'        => md5((string) $query['query'] . microtime()),
+                'qid'        => md5($query['query'] . microtime()),
             ];
         }, static::$queries);
 

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
@@ -498,7 +498,7 @@
   #toolbarContainer.dark #debug-bar .muted {
     color: #DFDFDF; }
     #toolbarContainer.dark #debug-bar .muted td {
-      color: #434343; }
+      color: #797979; }
     #toolbarContainer.dark #debug-bar .muted:hover td {
       color: #DFDFDF; }
   #toolbarContainer.dark #debug-bar #toolbar-position,
@@ -589,9 +589,9 @@
     -moz-box-shadow: 0 1px 4px #DFDFDF;
     -webkit-box-shadow: 0 1px 4px #DFDFDF; }
   #toolbarContainer.light #debug-bar .muted {
-    color: #434343; }
+    color: #797979; }
     #toolbarContainer.light #debug-bar .muted td {
-      color: #DFDFDF; }
+      color: #797979; }
     #toolbarContainer.light #debug-bar .muted:hover td {
       color: #434343; }
   #toolbarContainer.light #debug-bar #toolbar-position,