Skip to content

Commit 138cbda

Browse files
committed
Support summary badges on ModelsCollector
1 parent 8781b5d commit 138cbda

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/LaravelDebugbar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) {
472472
$this->addCollector(new ObjectCountCollector('models'));
473473
$eventList = ['retrieved', 'created', 'updated', 'deleted', 'restored'];
474474
$this['models']->setKeyMap(array_combine($eventList, array_map('ucfirst', $eventList)));
475+
$this['models']->collectCountSummary(true);
475476
foreach ($eventList as $event) {
476477
$events->listen("eloquent.{$event}: *", function ($event, $models) {
477478
$event = explode(': ', $event);

tests/DataCollector/JobsCollectorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public function testItCollectsDispatchedJobs()
3434
/** @var \DebugBar\DataCollector\ObjectCountCollector $collector */
3535
$collector = debugbar()->getCollector('jobs');
3636
$collector->setXdebugLinkTemplate('');
37-
$keyMap = ['value' => 'Count'];
37+
$collector->setKeyMap([]);
3838
$data = [];
3939

4040
$this->assertEquals(
41-
['data' => $data, 'count' => 0, 'key_map' => $keyMap, 'is_counter' => true],
41+
['data' => $data, 'count' => 0, 'key_map' => [], 'is_counter' => true],
4242
$collector->collect()
4343
);
4444

4545
OrderShipped::dispatch(1);
4646

4747
$data[OrderShipped::class] = ['value' => 1];
4848
$this->assertEquals(
49-
['data' => $data, 'count' => 1, 'key_map' => $keyMap, 'is_counter' => true],
49+
['data' => $data, 'count' => 1, 'key_map' => [], 'is_counter' => true],
5050
$collector->collect()
5151
);
5252

@@ -56,7 +56,7 @@ public function testItCollectsDispatchedJobs()
5656

5757
$data[SendNotification::class] = ['value' => 3];
5858
$this->assertEquals(
59-
['data' => $data, 'count' => 4, 'key_map' => $keyMap, 'is_counter' => true],
59+
['data' => $data, 'count' => 4, 'key_map' => [], 'is_counter' => true],
6060
$collector->collect()
6161
);
6262
}

tests/DataCollector/ModelsCollectorTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public function testItCollectsRetrievedModels()
2020
/** @var \DebugBar\DataCollector\ObjectCountCollector $collector */
2121
$collector = debugbar()->getCollector('models');
2222
$collector->setXdebugLinkTemplate('');
23-
$eventList = ['retrieved', 'created', 'updated', 'deleted', 'restored'];
24-
$keyMap = array_combine($eventList, array_map('ucfirst', $eventList));
23+
$collector->collectCountSummary(false);
24+
$collector->setKeyMap([]);
2525
$data = [];
2626

2727
$this->assertEquals(
28-
['data' => $data, 'count' => 0, 'key_map' => $keyMap, 'is_counter' => true],
28+
['data' => $data, 'key_map' => [], 'count' => 0, 'is_counter' => true],
2929
$collector->collect()
3030
);
3131

@@ -43,39 +43,39 @@ public function testItCollectsRetrievedModels()
4343

4444
$data[User::class] = ['created' => 2];
4545
$this->assertEquals(
46-
['data' => $data, 'key_map' => $keyMap, 'count' => 2, 'is_counter' => true],
46+
['data' => $data, 'key_map' => [], 'count' => 2, 'is_counter' => true],
4747
$collector->collect()
4848
);
4949

5050
$user = User::first();
5151

5252
$data[User::class]['retrieved'] = 1;
5353
$this->assertEquals(
54-
['data' => $data, 'key_map' => $keyMap, 'count' => 3, 'is_counter' => true],
54+
['data' => $data, 'key_map' => [], 'count' => 3, 'is_counter' => true],
5555
$collector->collect()
5656
);
5757

5858
$user->update(['name' => 'Jane Doe']);
5959

6060
$data[User::class]['updated'] = 1;
6161
$this->assertEquals(
62-
['data' => $data, 'key_map' => $keyMap, 'count' => 4, 'is_counter' => true],
62+
['data' => $data, 'key_map' => [], 'count' => 4, 'is_counter' => true],
6363
$collector->collect()
6464
);
6565

6666
Person::all();
6767

6868
$data[Person::class] = ['retrieved' => 2];
6969
$this->assertEquals(
70-
['data' => $data, 'key_map' => $keyMap, 'count' => 6, 'is_counter' => true],
70+
['data' => $data, 'key_map' => [], 'count' => 6, 'is_counter' => true],
7171
$collector->collect()
7272
);
7373

7474
$user->delete();
7575

7676
$data[User::class]['deleted'] = 1;
7777
$this->assertEquals(
78-
['data' => $data, 'key_map' => $keyMap, 'count' => 7, 'is_counter' => true],
78+
['data' => $data, 'key_map' => [], 'count' => 7, 'is_counter' => true],
7979
$collector->collect()
8080
);
8181
}

0 commit comments

Comments
 (0)