Fixes

Author: erikn69

src/DataCollector/CacheCollector.php

@@ -25,7 +25,7 @@ class CacheCollector extends TimeDataCollector
 
     public function __construct($requestStartTime, $collectValues)
     {
-        parent::__construct();
+        parent::__construct($requestStartTime);
 
         $this->collectValues = $collectValues;
     }
@@ -38,8 +38,22 @@ public function onCacheEvent(CacheEvent $event)
         $label = $this->classMap[$class];
 
         if (isset($params['value'])) {
+            if (is_string($params['value'])) {
+                $params['size'] = strlen($params['value']);
+            } else {
+                $params['size'] = strlen(serialize($params['value']));
+            }
+
+            if (isset($params['size'])) {
+                $params['size'] = $this->getDataFormatter()->formatBytes($params['size'] * 8);
+            }
+
             if ($this->collectValues) {
-                $params['value'] = htmlspecialchars($this->getDataFormatter()->formatVar($event->value));
+                if (is_string($params['value'])) {
+                    $params['value'] = @unserialize($params['value']) ?: $params['value'];
+                }
+
+                $params['value'] = htmlspecialchars($this->getDataFormatter()->formatVar($params['value']));
             } else {
                 unset($params['value']);
             }
@@ -60,7 +74,7 @@ public function onCacheEvent(CacheEvent $event)
 
     public function subscribe(Dispatcher $dispatcher)
     {
-        foreach ($this->classMap as $eventClass => $type) {
+        foreach (array_keys($this->classMap) as $eventClass) {
             $dispatcher->listen($eventClass, [$this, 'onCacheEvent']);
         }
     }

src/LaravelDebugbar.php

@@ -863,6 +863,7 @@ public function modifyResponse(Request $request, Response $response)
             && !$this->isJsonRequest($request, $response)
             && $response->getContent() !== false
             && in_array($request->getRequestFormat(), [null, 'html'], true)
+            && !$this->isJsonResponse($response)
         ) {
             try {
                 $this->injectDebugbar($response);
@@ -936,6 +937,30 @@ protected function isJsonRequest(Request $request, Response $response)
         return false;
     }
 
+    /**
+     * @param  \Symfony\Component\HttpFoundation\Response $response
+     * @return bool
+     */
+    protected function isJsonResponse(Response $response)
+    {
+        if ($response->headers->get('Content-Type') == 'application/json') {
+            return true;
+        }
+
+        $content = $response->getContent();
+
+        if (function_exists('json_validate')) {
+            return json_validate($content);
+        } else if (is_string($content)) {
+            // PHP <= 8.2 check
+            json_decode($content, true);
+
+            return json_last_error() === JSON_ERROR_NONE;
+        }
+
+        return false;
+    }
+
     /**
      * Collects the data from the collectors
      *