Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/Outputs/Debugbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
use Illuminate\Support\Collection;
use Symfony\Component\HttpFoundation\Response;

use Barryvdh\Debugbar\Facade as LaravelDebugbar;
use Barryvdh\Debugbar\Facade as LaravelDebugbarV3;
use DebugBar\DataCollector\MessagesCollector;
use Fruitcake\LaravelDebugbar\Facades\Debugbar as LaravelDebugbar;

class Debugbar implements Output
{
Expand All @@ -15,9 +16,16 @@ class Debugbar implements Output
public function boot()
{
$this->collector = new MessagesCollector('N+1 Queries');

if (!LaravelDebugbar::hasCollector($this->collector->getName())) {
LaravelDebugbar::addCollector($this->collector);

if (class_exists(\Fruitcake\LaravelDebugbar\Facades\Debugbar::class)) {
if (!LaravelDebugbar::hasCollector($this->collector->getName())) {
LaravelDebugbar::addCollector($this->collector);
}
return;
}

if (!LaravelDebugbarV3::hasCollector($this->collector->getName())) {
LaravelDebugbarV3::addCollector($this->collector);
}
}

Expand Down
Loading