Skip to content

Commit 6057dcf

Browse files
erikn69erikn69
authored
Minor nitpicks (#1521)
1 parent 6fd181a commit 6057dcf

File tree

4 files changed

+38
-61
lines changed

4 files changed

+38
-61
lines changed

‎src/DataCollector/GateCollector.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ public function addCheck($user, $ability, $result, $arguments = [])
5252

5353
$label = $result ? 'success' : 'error';
5454

55-
// Response::allowed() was added in Laravel 6.x
56-
if ($result instanceof Response && method_exists($result, 'allowed')) {
55+
if ($result instanceof Response) {
5756
$label = $result->allowed() ? 'success' : 'error';
5857
}
5958

‎src/DataCollector/LogsCollector.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,7 @@ public function __construct($path = null, $name = 'logs')
2525
*/
2626
public function getLogsFile()
2727
{
28-
// default daily rotating logs (Laravel 5.0)
29-
$path = storage_path() . '/logs/laravel-' . date('Y-m-d') . '.log';
30-
31-
// single file logs
32-
if (!file_exists($path)) {
33-
$path = storage_path() . '/logs/laravel.log';
34-
}
35-
36-
return $path;
28+
return storage_path() . '/logs/laravel.log';
3729
}
3830

3931
/**

‎src/DataCollector/MultiAuthCollector.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ private function hasUser(Guard $guard)
8989
return $guard->hasUser();
9090
}
9191

92-
// For Laravel 5.5
93-
if (method_exists($guard, 'alreadyAuthenticated')) {
94-
return $guard->alreadyAuthenticated();
95-
}
96-
9792
return false;
9893
}
9994

‎src/LaravelDebugbar.php‎

Lines changed: 36 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@ public function boot()
138138
return;
139139
}
140140

141-
/** @var \Barryvdh\Debugbar\LaravelDebugbar $debugbar */
142-
$debugbar = $this;
143-
144141
/** @var Application $app */
145142
$app = $this->app;
146143

@@ -158,7 +155,7 @@ public function boot()
158155
set_error_handler([$this, 'handleError']);
159156
}
160157

161-
$this->selectStorage($debugbar);
158+
$this->selectStorage($this);
162159

163160
if ($this->shouldCollect('phpinfo', true)) {
164161
$this->addCollector(new PhpInfoCollector());
@@ -177,41 +174,38 @@ public function boot()
177174
$this->addCollector(new TimeDataCollector($startTime));
178175

179176
if ($config->get('debugbar.options.time.memory_usage')) {
180-
$debugbar['time']->showMemoryUsage();
177+
$this['time']->showMemoryUsage();
181178
}
182179

183180
if (! $this->isLumen() && $startTime) {
184181
$app->booted(
185-
function () use ($debugbar, $startTime) {
186-
$debugbar->addMeasure('Booting', $startTime, microtime(true), [], 'time');
182+
function () use ($startTime) {
183+
$this->addMeasure('Booting', $startTime, microtime(true), [], 'time');
187184
}
188185
);
189186
}
190187

191-
$debugbar->startMeasure('application', 'Application', 'time');
188+
$this->startMeasure('application', 'Application', 'time');
192189
}
193190

194191
if ($this->shouldCollect('memory', true)) {
195-
$memoryCollector = new MemoryCollector();
196-
if (method_exists($memoryCollector, 'setPrecision')) {
197-
$memoryCollector->setPrecision($config->get('debugbar.options.memory.precision', 0));
198-
}
192+
$this->addCollector(new MemoryCollector());
193+
$this['memory']->setPrecision($config->get('debugbar.options.memory.precision', 0));
194+
199195
if (function_exists('memory_reset_peak_usage') && $config->get('debugbar.options.memory.reset_peak')) {
200196
memory_reset_peak_usage();
201197
}
202198
if ($config->get('debugbar.options.memory.with_baseline')) {
203-
$memoryCollector->resetMemoryBaseline();
199+
$this['memory']->resetMemoryBaseline();
204200
}
205-
$this->addCollector($memoryCollector);
206201
}
207202

208203
if ($this->shouldCollect('exceptions', true)) {
209204
try {
210-
$exceptionCollector = new ExceptionsCollector();
211-
$exceptionCollector->setChainExceptions(
205+
$this->addCollector(new ExceptionsCollector());
206+
$this['exceptions']->setChainExceptions(
212207
$config->get('debugbar.options.exceptions.chain', true)
213208
);
214-
$this->addCollector($exceptionCollector);
215209
} catch (Exception $e) {
216210
}
217211
}
@@ -354,53 +348,53 @@ function (\Illuminate\Database\Events\QueryExecuted $query) {
354348
try {
355349
$events->listen(
356350
\Illuminate\Database\Events\TransactionBeginning::class,
357-
function ($transaction) use ($queryCollector) {
358-
$queryCollector->collectTransactionEvent('Begin Transaction', $transaction->connection);
351+
function ($transaction) {
352+
$this['queries']->collectTransactionEvent('Begin Transaction', $transaction->connection);
359353
}
360354
);
361355

362356
$events->listen(
363357
\Illuminate\Database\Events\TransactionCommitted::class,
364-
function ($transaction) use ($queryCollector) {
365-
$queryCollector->collectTransactionEvent('Commit Transaction', $transaction->connection);
358+
function ($transaction) {
359+
$this['queries']->collectTransactionEvent('Commit Transaction', $transaction->connection);
366360
}
367361
);
368362

369363
$events->listen(
370364
\Illuminate\Database\Events\TransactionRolledBack::class,
371-
function ($transaction) use ($queryCollector) {
372-
$queryCollector->collectTransactionEvent('Rollback Transaction', $transaction->connection);
365+
function ($transaction) {
366+
$this['queries']->collectTransactionEvent('Rollback Transaction', $transaction->connection);
373367
}
374368
);
375369

376370
$events->listen(
377371
'connection.*.beganTransaction',
378-
function ($event, $params) use ($queryCollector) {
379-
$queryCollector->collectTransactionEvent('Begin Transaction', $params[0]);
372+
function ($event, $params) {
373+
$this['queries']->collectTransactionEvent('Begin Transaction', $params[0]);
380374
}
381375
);
382376

383377
$events->listen(
384378
'connection.*.committed',
385-
function ($event, $params) use ($queryCollector) {
386-
$queryCollector->collectTransactionEvent('Commit Transaction', $params[0]);
379+
function ($event, $params) {
380+
$this['queries']->collectTransactionEvent('Commit Transaction', $params[0]);
387381
}
388382
);
389383

390384
$events->listen(
391385
'connection.*.rollingBack',
392-
function ($event, $params) use ($queryCollector) {
393-
$queryCollector->collectTransactionEvent('Rollback Transaction', $params[0]);
386+
function ($event, $params) {
387+
$this['queries']->collectTransactionEvent('Rollback Transaction', $params[0]);
394388
}
395389
);
396390

397391
$events->listen(
398-
function (\Illuminate\Database\Events\ConnectionEstablished $event) use ($queryCollector) {
399-
$queryCollector->collectTransactionEvent('Connection Established', $event->connection);
392+
function (\Illuminate\Database\Events\ConnectionEstablished $event) {
393+
$this['queries']->collectTransactionEvent('Connection Established', $event->connection);
400394

401395
if (app('config')->get('debugbar.options.db.memory_usage')) {
402-
$event->connection->beforeExecuting(function () use ($queryCollector) {
403-
$queryCollector->startMemoryUsage();
396+
$event->connection->beforeExecuting(function () {
397+
$this['queries']->startMemoryUsage();
404398
});
405399
}
406400
}
@@ -433,17 +427,16 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) use ($queryC
433427

434428
if ($this->shouldCollect('mail', true) && class_exists('Illuminate\Mail\MailServiceProvider') && $events) {
435429
try {
436-
$mailCollector = new SymfonyMailCollector();
437-
$this->addCollector($mailCollector);
438-
$events->listen(function (MessageSent $event) use ($mailCollector) {
439-
$mailCollector->addSymfonyMessage($event->sent->getSymfonySentMessage());
430+
$this->addCollector(new SymfonyMailCollector());
431+
$events->listen(function (MessageSent $event) {
432+
$this['mail']->addSymfonyMessage($event->sent->getSymfonySentMessage());
440433
});
441434

442435
if ($config->get('debugbar.options.mail.full_log')) {
443-
$mailCollector->showMessageDetail();
436+
$this['mail']->showMessageDetail();
444437
}
445438

446-
if ($debugbar->hasCollector('time') && $config->get('debugbar.options.mail.timeline')) {
439+
if ($this->hasCollector('time') && $config->get('debugbar.options.mail.timeline')) {
447440
$transport = $app['mailer']->getSymfonyTransport();
448441
$app['mailer']->setSymfonyTransport(new class ($transport, $this) extends AbstractTransport{
449442
private $originalTransport;
@@ -493,12 +486,11 @@ public function __toString(): string
493486
if ($this->shouldCollect('auth', false)) {
494487
try {
495488
$guards = $config->get('auth.guards', []);
496-
$authCollector = new MultiAuthCollector($app['auth'], $guards);
489+
$this->addCollector(new MultiAuthCollector($app['auth'], $guards));
497490

498-
$authCollector->setShowName(
491+
$this['auth']->setShowName(
499492
$config->get('debugbar.options.auth.show_name')
500493
);
501-
$this->addCollector($authCollector);
502494
} catch (Exception $e) {
503495
$this->addCollectorException('Cannot add AuthCollector', $e);
504496
}
@@ -516,9 +508,8 @@ public function __toString(): string
516508
try {
517509
$collectValues = $config->get('debugbar.options.cache.values', true);
518510
$startTime = $app['request']->server('REQUEST_TIME_FLOAT');
519-
$cacheCollector = new CacheCollector($startTime, $collectValues);
520-
$this->addCollector($cacheCollector);
521-
$events->subscribe($cacheCollector);
511+
$this->addCollector(new CacheCollector($startTime, $collectValues));
512+
$events->subscribe($this['cache']);
522513
} catch (Exception $e) {
523514
$this->addCollectorException('Cannot add CacheCollector', $e);
524515
}

0 commit comments

Comments
 (0)