Remove Craft:: dependency from TemplateProfiler

Author: riasvdv

src/View/TemplateProfiler.php

@@ -4,9 +4,11 @@
 
 namespace CraftCms\Cms\View;
 
-use Craft;
 use Illuminate\Container\Attributes\Scoped;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+use function CraftCms\Cms\debugbar;
 
 #[Scoped]
 class TemplateProfiler
@@ -26,6 +28,9 @@ class TemplateProfiler
     /** @var array<string, array<string, int>> */
     private array $profileCounters = [];
 
+    /** @var array<string, int> */
+    private array $timers = [];
+
     public function beginProfile(string $type, string $name): void
     {
         if (! $this->shouldProfile()) {
@@ -38,7 +43,15 @@ public function beginProfile(string $type, string $name): void
             $count = ++$this->profileCounters[$type][$name];
         }
 
-        Craft::beginProfile($this->profileToken($type, $name, $count), 'Twig template');
+        $this->timers[$this->profileToken($type, $name, $count)] = hrtime(true);
+
+        debugbar()->startMeasure($this->profileToken($type, $name, $count), "{$type} {$name}");
+
+        Log::debug('profile begin', [
+            'name' => $name,
+            'type' => $type,
+            'count' => $count,
+        ]);
     }
 
     public function endProfile(string $type, string $name): void
@@ -48,7 +61,29 @@ public function endProfile(string $type, string $name): void
         }
 
         $count = $this->profileCounters[$type][$name]--;
-        Craft::endProfile($this->profileToken($type, $name, $count), 'Twig template');
+
+        debugbar()->stopMeasure($this->profileToken($type, $name, $count));
+
+        $start = $this->timers[$this->profileToken($type, $name, $count)] ?? null;
+
+        if ($start === null) {
+            Log::debug('profile end without start', [
+                'name' => $name,
+                'type' => $type,
+                'count' => $count,
+            ]);
+
+            return;
+        }
+
+        $durationMs = round((hrtime(true) - $start) / 1_000_000, 2);
+
+        Log::debug('profile end', [
+            'name' => $name,
+            'type' => $type,
+            'count' => $count,
+            'duration_ms' => $durationMs,
+        ]);
     }
 
     private function shouldProfile(): bool
@@ -67,7 +102,7 @@ private function shouldProfile(): bool
             return $this->shouldProfile = false;
         }
 
-        return $this->shouldProfile = $user->admin && $user->getPreference('profileTemplates');
+        return $this->shouldProfile = ($user->admin && $user->getPreference('profileTemplates'));
     }
 
     private function profileToken(string $type, string $name, int $count): string