Bring back view measuring

Author: erikn69

src/DataCollector/CacheCollector.php

@@ -55,9 +55,6 @@ public function onCacheEvent($event)
         $class = get_class($event);
         $params = get_object_vars($event);
         $label = $this->classMap[$class][0];
-        $endTime = microtime(true);
-        $startHashKey = $this->getEventHash($this->classMap[$class][1] ?? '', $params);
-        $startTime = $this->eventStarts[$startHashKey] ?? $endTime;
 
         if (isset($params['value'])) {
             $params['memoryUsage'] = strlen(serialize($params['value'])) * 8;
@@ -82,7 +79,10 @@ public function onCacheEvent($event)
             ]);
         }
 
-        $this->addMeasure($label . "\t" . ($params['key'] ?? ''), $startTime, $endTime, $params);
+        $time = microtime(true);
+        $startHashKey = $this->getEventHash($this->classMap[$class][1] ?? '', $params);
+        $startTime = $this->eventStarts[$startHashKey] ?? $time;
+        $this->addMeasure($label . "\t" . ($params['key'] ?? ''), $startTime, $time, $params);
     }
 
     public function onStartCacheEvent($event)

src/DebugbarViewEngine.php

@@ -59,7 +59,7 @@ public function get($path, array $data = [])
 
         return $this->laravelDebugbar->measure($shortPath, function () use ($path, $data) {
             return $this->engine->get($path, $data);
-        }, 'views');
+        }, 'views', 'Views Rendering');
     }
 
     /**

src/LaravelDebugbar.php

@@ -289,12 +289,7 @@ function () use ($startTime) {
                 $collectData = $config->get('debugbar.options.views.data', true);
                 $excludePaths = $config->get('debugbar.options.views.exclude_paths', []);
                 $group = $config->get('debugbar.options.views.group', true);
-                if ($this->hasCollector('time') && $config->get('debugbar.options.views.timeline', false)) {
-                    $timeCollector = $this['time'];
-                } else {
-                    $timeCollector = null;
-                }
-                $this->addCollector(new ViewCollector($collectData, $excludePaths, $group, $timeCollector));
+                $this->addCollector(new ViewCollector($collectData, $excludePaths, $group));
                 $events->listen(
                     'composing:*',
                     function ($event, $params) {

src/ServiceProvider.php

@@ -48,6 +48,42 @@ function ($app) {
             }
         );
 
+        $this->app->extend(
+            'view',
+            function (Factory $factory, Container $application): Factory {
+                $laravelDebugbar = $application->make(LaravelDebugbar::class);
+
+                $shouldTrackViewTime = $laravelDebugbar->isEnabled() &&
+                    $laravelDebugbar->shouldCollect('time', true) &&
+                    $laravelDebugbar->shouldCollect('views', true) &&
+                    $application['config']->get('debugbar.options.views.timeline', false);
+
+                if (! $shouldTrackViewTime) {
+                    /* Do not swap the engine to save performance */
+                    return $factory;
+                }
+
+                $extensions = array_reverse($factory->getExtensions());
+                $engines = array_flip($extensions);
+                $enginesResolver = $application->make('view.engine.resolver');
+
+                foreach ($engines as $engine => $extension) {
+                    $resolved = $enginesResolver->resolve($engine);
+
+                    $factory->addExtension($extension, $engine, function () use ($resolved, $laravelDebugbar) {
+                        return new DebugbarViewEngine($resolved, $laravelDebugbar);
+                    });
+                }
+
+                // returns original order of extensions
+                foreach ($extensions as $extension => $engine) {
+                    $factory->addExtension($extension, $engine);
+                }
+
+                return $factory;
+            }
+        );
+
         Collection::macro('debug', function () {
             debug($this);
             return $this;