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
45 changes: 34 additions & 11 deletions src/Outputs/Debugbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@

namespace BeyondCode\QueryDetector\Outputs;

use DebugBar\DataCollector\MessagesCollector;
use Illuminate\Support\Collection;
use Symfony\Component\HttpFoundation\Response;

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

class Debugbar implements Output
{
protected $collector;
Expand All @@ -17,26 +14,52 @@ public function boot()
{
$this->collector = new MessagesCollector('N+1 Queries');

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

if ($facade === null) {
return;
}

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

public function output(Collection $detectedQueries, Response $response)
{
foreach ($detectedQueries as $detectedQuery) {
$this->collector->addMessage(sprintf('Model: %s => Relation: %s - You should add `with(%s)` to eager-load this relation.',
$this->collector->addMessage(sprintf(
'Model: %s => Relation: %s - You should add `with(%s)` to eager-load this relation.',
$detectedQuery['model'],
$detectedQuery['relation'],
$detectedQuery['relation']
));
}
}

/**
* Resolve the installed Debugbar facade at runtime.
*
* Supports barryvdh/laravel-debugbar (v3 and v4+) and
* fruitcake/laravel-debugbar. Returns the first class
* that the autoloader can locate, or null if none exist.
*
* @return string|null
*/
protected function resolveDebugbarFacade()
{
$candidates = [
'Barryvdh\Debugbar\Facades\Debugbar',
'Barryvdh\Debugbar\Facade',
'Fruitcake\LaravelDebugbar\Facades\Debugbar',
];

foreach ($candidates as $candidate) {
if (class_exists($candidate)) {
return $candidate;
}
}

return null;
}
}
Loading