Collect other eloquent model events

Author: erikn69

src/LaravelDebugbar.php

@@ -470,11 +470,15 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) {
         if ($this->shouldCollect('models', true) && $events) {
             try {
                 $this->addCollector(new ObjectCountCollector('models'));
-                $events->listen('eloquent.retrieved:*', function ($event, $models) {
-                    foreach (array_filter($models) as $model) {
-                        $this['models']->countClass($model);
-                    }
-                });
+                $eventList = ['retrieved', 'created', 'updated', 'deleted', 'restored'];
+                $this['models']->setKeyMap(array_combine($eventList, array_map('ucfirst', $eventList)));
+                foreach ($eventList as $event) {
+                    $events->listen("eloquent.{$event}: *", function ($event, $models) {
+                        $event = explode(': ', $event);
+                        $count = count(array_filter($models));
+                        $this['models']->countClass($event[1], $count, explode('.', $event[0])[1]);
+                    });
+                }
             } catch (Exception $e) {
                 $this->addCollectorException('Cannot add Models Collector', $e);
             }

src/Resources/laravel-debugbar.css

@@ -227,7 +227,8 @@ div.phpdebugbar .phpdebugbar-header select {
 }
 
 dl.phpdebugbar-widgets-kvlist dt,
-dl.phpdebugbar-widgets-kvlist dd {
+dl.phpdebugbar-widgets-kvlist dd,
+table.phpdebugbar-widgets-tablevar td {
     min-height: 20px;
     line-height: 20px;
     padding: 4px 5px 5px;
@@ -239,7 +240,8 @@ dl.phpdebugbar-widgets-kvlist dd.phpdebugbar-widgets-value.phpdebugbar-widgets-p
     background: transparent;
 }
 
-dl.phpdebugbar-widgets-kvlist dt {
+dl.phpdebugbar-widgets-kvlist dt,
+table.phpdebugbar-widgets-tablevar td:first-child {
     width: calc(25% - 10px);
 }
 
@@ -459,7 +461,8 @@ div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params td.phpdebugb
     margin-left: 3px;
 }
 
-ul.phpdebugbar-widgets-list li.phpdebugbar-widgets-list-item:nth-child(even) {
+ul.phpdebugbar-widgets-list li.phpdebugbar-widgets-list-item:nth-child(even),
+table.phpdebugbar-widgets-tablevar tr:nth-child(even) {
     background-color: var(--debugbar-background-alt);
 }
 
@@ -476,6 +479,10 @@ div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugb
     float: left;
 }
 
+table.phpdebugbar-widgets-tablevar td {
+    border: 0;
+}
+
 div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-info {
     color: #1299DA;
 }

src/Support/Clockwork/Converter.php

@@ -117,7 +117,16 @@ public function convert($data)
             $output['modelsCreated'] = [];
             $output['modelsUpdated'] = [];
             $output['modelsDeleted'] = [];
-            $output['modelsRetrieved'] = $data['models']['data'];
+            $output['modelsRetrieved'] = [];
+
+            foreach ($data['models']['data'] as $model => $value) {
+                foreach ($value as $event => $count) {
+                    $eventKey = 'models' . ucfirst($event);
+                    if (isset($output[$eventKey])) {
+                        $output[$eventKey][$model] = $count;
+                    }
+                }
+            }
         }
 
         if (isset($data['views']['templates'])) {

tests/DataCollector/ModelsCollectorTest.php

@@ -14,6 +14,10 @@ class ModelsCollectorTest extends TestCase
 
     public function testItCollectsRetrievedModels()
     {
+        $eventList = ['retrieved', 'created', 'updated', 'deleted', 'restored'];
+        $keyMap = array_combine($eventList, array_map('ucfirst', $eventList));
+        $data = [];
+
         $this->loadLaravelMigrations();
 
         debugbar()->boot();
@@ -22,6 +26,11 @@ public function testItCollectsRetrievedModels()
         $collector = debugbar()->getCollector('models');
         $collector->setXdebugLinkTemplate('');
 
+        $this->assertEquals(
+            ['data' => $data, 'count' => 0, 'key_map' => $keyMap, 'is_counter' => true],
+            $collector->collect()
+        );
+
         User::create([
             'name' => 'John Doe',
             'email' => 'john@example.com',
@@ -34,22 +43,41 @@ public function testItCollectsRetrievedModels()
             'password' => Hash::make('password'),
         ]);
 
+        $data[User::class] = ['created' => 2];
         $this->assertEquals(
-            ['data' => [], 'count' => 0, 'is_counter' => true],
+            ['data' => $data, 'key_map' => $keyMap, 'count' => 2, 'is_counter' => true],
             $collector->collect()
         );
 
-        User::first();
+        $user = User::first();
 
+        $data[User::class]['retrieved'] = 1;
         $this->assertEquals(
-            ['data' => [User::class => 1], 'count' => 1, 'is_counter' => true],
+            ['data' => $data, 'key_map' => $keyMap, 'count' => 3, 'is_counter' => true],
+            $collector->collect()
+        );
+
+        $user->update(['name' => 'Jane Doe']);
+
+        $data[User::class]['updated'] = 1;
+        $this->assertEquals(
+            ['data' => $data, 'key_map' => $keyMap, 'count' => 4, 'is_counter' => true],
             $collector->collect()
         );
 
         Person::all();
 
+        $data[Person::class] = ['retrieved' => 2];
+        $this->assertEquals(
+            ['data' => $data, 'key_map' => $keyMap, 'count' => 6, 'is_counter' => true],
+            $collector->collect()
+        );
+
+        $user->delete();
+
+        $data[User::class]['deleted'] = 1;
         $this->assertEquals(
-            ['data' => [User::class => 1, Person::class => 2], 'count' => 3, 'is_counter' => true],
+            ['data' => $data, 'key_map' => $keyMap, 'count' => 7, 'is_counter' => true],
             $collector->collect()
         );
     }