|
2 | 2 |
|
3 | 3 | namespace Barryvdh\Debugbar;
|
4 | 4 |
|
5 |
| -use Barryvdh\Debugbar\DataCollector\AuthCollector; |
6 | 5 | use Barryvdh\Debugbar\DataCollector\CacheCollector;
|
7 | 6 | use Barryvdh\Debugbar\DataCollector\EventCollector;
|
8 | 7 | use Barryvdh\Debugbar\DataCollector\FilesCollector;
|
9 | 8 | use Barryvdh\Debugbar\DataCollector\GateCollector;
|
10 | 9 | use Barryvdh\Debugbar\DataCollector\LaravelCollector;
|
| 10 | +use Barryvdh\Debugbar\DataCollector\LivewireCollector; |
11 | 11 | use Barryvdh\Debugbar\DataCollector\LogsCollector;
|
12 | 12 | use Barryvdh\Debugbar\DataCollector\MultiAuthCollector;
|
13 | 13 | use Barryvdh\Debugbar\DataCollector\QueryCollector;
|
14 | 14 | use Barryvdh\Debugbar\DataCollector\SessionCollector;
|
15 | 15 | use Barryvdh\Debugbar\DataCollector\RequestCollector;
|
| 16 | +use Barryvdh\Debugbar\DataCollector\RouteCollector; |
16 | 17 | use Barryvdh\Debugbar\DataCollector\ViewCollector;
|
| 18 | +use Barryvdh\Debugbar\DataFormatter\QueryFormatter; |
17 | 19 | use Barryvdh\Debugbar\Storage\SocketStorage;
|
18 | 20 | use Barryvdh\Debugbar\Storage\FilesystemStorage;
|
| 21 | +use Barryvdh\Debugbar\Support\Clockwork\ClockworkCollector; |
19 | 22 | use DebugBar\Bridge\MonologCollector;
|
20 | 23 | use DebugBar\Bridge\Symfony\SymfonyMailCollector;
|
21 | 24 | use DebugBar\DataCollector\ConfigCollector;
|
|
27 | 30 | use DebugBar\DataCollector\PhpInfoCollector;
|
28 | 31 | use DebugBar\DataCollector\RequestDataCollector;
|
29 | 32 | use DebugBar\DataCollector\TimeDataCollector;
|
30 |
| -use Barryvdh\Debugbar\DataFormatter\QueryFormatter; |
31 |
| -use Barryvdh\Debugbar\Support\Clockwork\ClockworkCollector; |
32 | 33 | use DebugBar\DebugBar;
|
33 | 34 | use DebugBar\Storage\PdoStorage;
|
34 | 35 | use DebugBar\Storage\RedisStorage;
|
35 | 36 | use Exception;
|
36 |
| -use Throwable; |
37 | 37 | use Illuminate\Contracts\Foundation\Application;
|
38 | 38 | use Illuminate\Mail\Events\MessageSent;
|
39 | 39 | use Illuminate\Session\SessionManager;
|
|
44 | 44 | use Symfony\Component\Mailer\SentMessage;
|
45 | 45 | use Symfony\Component\Mailer\Transport\AbstractTransport;
|
46 | 46 | use Symfony\Component\Mime\RawMessage;
|
| 47 | +use Throwable; |
47 | 48 |
|
48 | 49 | /**
|
49 | 50 | * Debug bar subclass which adds all without Request and with LaravelCollector.
|
@@ -249,7 +250,7 @@ function ($event, $params) {
|
249 | 250 |
|
250 | 251 | if (!$this->isLumen() && $this->shouldCollect('route')) {
|
251 | 252 | try {
|
252 |
| - $this->addCollector($this->app->make('Barryvdh\Debugbar\DataCollector\RouteCollector')); |
| 253 | + $this->addCollector($app->make(RouteCollector::class)); |
253 | 254 | } catch (Exception $e) {
|
254 | 255 | $this->addCollectorException('Cannot add RouteCollector', $e);
|
255 | 256 | }
|
@@ -427,10 +428,9 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) use ($queryC
|
427 | 428 | }
|
428 | 429 | }
|
429 | 430 |
|
430 |
| - if ($this->shouldCollect('livewire', true) && $this->app->bound('livewire')) { |
| 431 | + if ($this->shouldCollect('livewire', true) && $app->bound('livewire')) { |
431 | 432 | try {
|
432 |
| - $livewireCollector = $this->app->make('Barryvdh\Debugbar\DataCollector\LivewireCollector'); |
433 |
| - $this->addCollector($livewireCollector); |
| 433 | + $this->addCollector($app->make(LivewireCollector::class)); |
434 | 434 | } catch (Exception $e) {
|
435 | 435 | $this->addCollectorException('Cannot add Livewire Collector', $e);
|
436 | 436 | }
|
@@ -511,8 +511,7 @@ public function __toString(): string
|
511 | 511 |
|
512 | 512 | if ($this->shouldCollect('gate', false)) {
|
513 | 513 | try {
|
514 |
| - $gateCollector = $this->app->make('Barryvdh\Debugbar\DataCollector\GateCollector'); |
515 |
| - $this->addCollector($gateCollector); |
| 514 | + $this->addCollector($app->make(GateCollector::class)); |
516 | 515 | } catch (Exception $e) {
|
517 | 516 | $this->addCollectorException('Cannot add GateCollector', $e);
|
518 | 517 | }
|
|
0 commit comments