Refactor Models, Jobs to ObjectCountCollector (#1517)

Author: erikn69

src/DataCollector/JobsCollector.php

@@ -9,7 +9,6 @@
 use Barryvdh\Debugbar\DataCollector\GateCollector;
 use Barryvdh\Debugbar\DataCollector\LaravelCollector;
 use Barryvdh\Debugbar\DataCollector\LogsCollector;
-use Barryvdh\Debugbar\DataCollector\ModelsCollector;
 use Barryvdh\Debugbar\DataCollector\MultiAuthCollector;
 use Barryvdh\Debugbar\DataCollector\QueryCollector;
 use Barryvdh\Debugbar\DataCollector\SessionCollector;
@@ -24,6 +23,7 @@
 use DebugBar\DataCollector\ExceptionsCollector;
 use DebugBar\DataCollector\MemoryCollector;
 use DebugBar\DataCollector\MessagesCollector;
+use DebugBar\DataCollector\ObjectCountCollector;
 use Barryvdh\Debugbar\DataCollector\PhpInfoCollector;
 use DebugBar\DataCollector\RequestDataCollector;
 use DebugBar\DataCollector\TimeDataCollector;
@@ -460,8 +460,12 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) use ($queryC
 
         if ($this->shouldCollect('models', true)) {
             try {
-                $modelsCollector = $this->app->make('Barryvdh\Debugbar\DataCollector\ModelsCollector');
-                $this->addCollector($modelsCollector);
+                $this->addCollector(new ObjectCountCollector('models'));
+                $this->app['events']->listen('eloquent.retrieved:*', function ($event, $models) {
+                    foreach (array_filter($models) as $model) {
+                        $this['models']->countClass($model);
+                    }
+                });
             } catch (\Exception $e) {
                 // No Models collector
             }
@@ -598,8 +602,10 @@ public function __toString(): string
 
         if ($this->shouldCollect('jobs', false)) {
             try {
-                $jobsCollector = $this->app->make('Barryvdh\Debugbar\DataCollector\JobsCollector');
-                $this->addCollector($jobsCollector);
+                $this->addCollector(new ObjectCountCollector('jobs', 'briefcase'));
+                $this->app['events']->listen(\Illuminate\Queue\Events\JobQueued::class, function ($event) {
+                    $this['jobs']->countClass($event->job);
+                });
             } catch (\Exception $e) {
                 // No Jobs collector
             }

src/DataCollector/ModelsCollector.php

@@ -31,18 +31,19 @@ public function testItCollectsDispatchedJobs()
 
         debugbar()->boot();
 
-        /** @var \Barryvdh\Debugbar\DataCollector\ModelsCollector $collector */
+        /** @var \DebugBar\DataCollector\ObjectCountCollector $collector */
         $collector = debugbar()->getCollector('jobs');
+        $collector->setXdebugLinkTemplate('');
 
         $this->assertEquals(
-            ['data' => [], 'count' => 0],
+            ['data' => [], 'count' => 0, 'is_counter' => true],
             $collector->collect()
         );
 
         OrderShipped::dispatch(1);
 
         $this->assertEquals(
-            ['data' => [OrderShipped::class => 1], 'count' => 1],
+            ['data' => [OrderShipped::class => 1], 'count' => 1, 'is_counter' => true],
             $collector->collect()
         );
 
@@ -51,7 +52,7 @@ public function testItCollectsDispatchedJobs()
         dispatch(new SendNotification());
 
         $this->assertEquals(
-            ['data' => [OrderShipped::class => 1, SendNotification::class => 3], 'count' => 4],
+            ['data' => [OrderShipped::class => 1, SendNotification::class => 3], 'count' => 4, 'is_counter' => true],
             $collector->collect()
         );
     }

src/LaravelDebugbar.php

@@ -18,8 +18,9 @@ public function testItCollectsRetrievedModels()
 
         debugbar()->boot();
 
-        /** @var \Barryvdh\Debugbar\DataCollector\ModelsCollector $collector */
+        /** @var \DebugBar\DataCollector\ObjectCountCollector $collector */
         $collector = debugbar()->getCollector('models');
+        $collector->setXdebugLinkTemplate('');
 
         User::create([
             'name' => 'John Doe',
@@ -34,21 +35,21 @@ public function testItCollectsRetrievedModels()
         ]);
 
         $this->assertEquals(
-            ['data' => [], 'count' => 0],
+            ['data' => [], 'count' => 0, 'is_counter' => true],
             $collector->collect()
         );
 
         User::first();
 
         $this->assertEquals(
-            ['data' => [User::class => 1], 'count' => 1],
+            ['data' => [User::class => 1], 'count' => 1, 'is_counter' => true],
             $collector->collect()
         );
 
         Person::all();
 
         $this->assertEquals(
-            ['data' => [User::class => 1, Person::class => 2], 'count' => 3],
+            ['data' => [User::class => 1, Person::class => 2], 'count' => 3, 'is_counter' => true],
             $collector->collect()
         );
     }