From c64346713f512fa4d40ecef44107bb445980b3ad Mon Sep 17 00:00:00 2001
From: erikn69 <erikn_69@hotmail.com>
Date: Fri, 4 Apr 2025 12:33:45 -0500
Subject: [PATCH 1/3] Add new cache events on CacheCollector

---
 src/DataCollector/CacheCollector.php | 26 ++++++++++++++++----------
 src/Resources/cache/widget.js        |  3 +++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/DataCollector/CacheCollector.php b/src/DataCollector/CacheCollector.php
index 1f6e640bb..2e4ea78a6 100644
--- a/src/DataCollector/CacheCollector.php
+++ b/src/DataCollector/CacheCollector.php
@@ -4,11 +4,15 @@
 
 use DebugBar\DataCollector\TimeDataCollector;
 use DebugBar\DataFormatter\HasDataFormatter;
-use Illuminate\Cache\Events\CacheEvent;
-use Illuminate\Cache\Events\CacheHit;
-use Illuminate\Cache\Events\CacheMissed;
-use Illuminate\Cache\Events\KeyForgotten;
-use Illuminate\Cache\Events\KeyWritten;
+use Illuminate\Cache\Events\{
+    CacheFlushed,
+    CacheHit,
+    CacheMissed,
+    KeyForgetFailed,
+    KeyForgotten,
+    KeyWriteFailed,
+    KeyWritten,
+};
 use Illuminate\Events\Dispatcher;
 
 class CacheCollector extends TimeDataCollector
@@ -22,8 +26,11 @@ class CacheCollector extends TimeDataCollector
     protected $classMap = [
         CacheHit::class => 'hit',
         CacheMissed::class => 'missed',
+        CacheFlushed::class => 'flushed',
         KeyWritten::class => 'written',
+        KeyWriteFailed::class => 'write_failed',
         KeyForgotten::class => 'forgotten',
+        KeyForgetFailed::class => 'forget_failed',
     ];
 
     public function __construct($requestStartTime, $collectValues)
@@ -33,7 +40,7 @@ public function __construct($requestStartTime, $collectValues)
         $this->collectValues = $collectValues;
     }
 
-    public function onCacheEvent(CacheEvent $event)
+    public function onCacheEvent($event)
     {
         $class = get_class($event);
         $params = get_object_vars($event);
@@ -53,7 +60,7 @@ public function onCacheEvent(CacheEvent $event)
         }
 
 
-        if (!empty($params['key']) && in_array($label, ['hit', 'written'])) {
+        if (!empty($params['key'] ?? null) && in_array($label, ['hit', 'written'])) {
             $params['delete'] = route('debugbar.cache.delete', [
                 'key' => urlencode($params['key']),
                 'tags' => !empty($params['tags']) ? json_encode($params['tags']) : '',
@@ -61,13 +68,12 @@ public function onCacheEvent(CacheEvent $event)
         }
 
         $time = microtime(true);
-        $this->addMeasure($label . "\t" . $event->key, $time, $time, $params);
+        $this->addMeasure($label . "\t" . ($params['key'] ?? ''), $time, $time, $params);
     }
 
-
     public function subscribe(Dispatcher $dispatcher)
     {
-        foreach ($this->classMap as $eventClass => $type) {
+        foreach (array_keys($this->classMap) as $eventClass) {
             $dispatcher->listen($eventClass, [$this, 'onCacheEvent']);
         }
     }
diff --git a/src/Resources/cache/widget.js b/src/Resources/cache/widget.js
index 5314eacec..34086ce00 100644
--- a/src/Resources/cache/widget.js
+++ b/src/Resources/cache/widget.js
@@ -40,6 +40,9 @@
                         var m = lines[i];
 
                         if (measure.params && !$.isEmptyObject(measure.params)) {
+                            if (measure.params.delete) {
+                                $(m).next().find('td:contains(delete)').parent().remove();
+                            }
                             if (measure.params.delete && measure.params.key) {
                                 $('<a />')
                                     .addClass(csscls('forget'))

From 4a33d8df2e63659616ac1074a64c29e2aa867d26 Mon Sep 17 00:00:00 2001
From: erikn69 <erikn_69@hotmail.com>
Date: Tue, 22 Apr 2025 12:00:17 -0500
Subject: [PATCH 2/3] Add CacheFlushFailed event

---
 src/DataCollector/CacheCollector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/DataCollector/CacheCollector.php b/src/DataCollector/CacheCollector.php
index 2e4ea78a6..03847e6f9 100644
--- a/src/DataCollector/CacheCollector.php
+++ b/src/DataCollector/CacheCollector.php
@@ -6,6 +6,7 @@
 use DebugBar\DataFormatter\HasDataFormatter;
 use Illuminate\Cache\Events\{
     CacheFlushed,
+    CacheFlushFailed,
     CacheHit,
     CacheMissed,
     KeyForgetFailed,
@@ -27,6 +28,7 @@ class CacheCollector extends TimeDataCollector
         CacheHit::class => 'hit',
         CacheMissed::class => 'missed',
         CacheFlushed::class => 'flushed',
+        CacheFlushFailed::class => 'flush_failed',
         KeyWritten::class => 'written',
         KeyWriteFailed::class => 'write_failed',
         KeyForgotten::class => 'forgotten',

From fd1ba57c7926cafcdd8e360c4b65de29579e542e Mon Sep 17 00:00:00 2001
From: erikn69 <erikn_69@hotmail.com>
Date: Fri, 25 Apr 2025 17:19:29 -0500
Subject: [PATCH 3/3] Fix

---
 src/Resources/cache/widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/cache/widget.js b/src/Resources/cache/widget.js
index 34086ce00..5635363e6 100644
--- a/src/Resources/cache/widget.js
+++ b/src/Resources/cache/widget.js
@@ -41,7 +41,7 @@
 
                         if (measure.params && !$.isEmptyObject(measure.params)) {
                             if (measure.params.delete) {
-                                $(m).next().find('td:contains(delete)').parent().remove();
+                                $(m).next().find('td.phpdebugbar-widgets-name:contains(delete)').closest('tr').remove();
                             }
                             if (measure.params.delete && measure.params.key) {
                                 $('<a />')