@@ -238,11 +238,8 @@ function () use ($debugbar, $startTime) {
238
238
$ this ->addCollector (new ViewCollector ($ collectData , $ excludePaths , $ group ));
239
239
$ this ->app ['events ' ]->listen (
240
240
'composing:* ' ,
241
- function ($ view , $ data = []) use ($ debugbar ) {
242
- if ($ data ) {
243
- $ view = $ data [0 ]; // For Laravel >= 5.4
244
- }
245
- $ debugbar ['views ' ]->addView ($ view );
241
+ function ($ event , $ params ) {
242
+ $ this ['views ' ]->addView ($ params [0 ]);
246
243
}
247
244
);
248
245
} catch (Exception $ e ) {
@@ -264,19 +261,11 @@ function ($view, $data = []) use ($debugbar) {
264
261
$ logger = new MessagesCollector ('log ' );
265
262
$ this ['messages ' ]->aggregate ($ logger );
266
263
$ this ->app ['log ' ]->listen (
267
- function ($ level , $ message = null , $ context = null ) use ($ logger ) {
268
- // Laravel 5.4 changed how the global log listeners are called. We must account for
269
- // the first argument being an "event object", where arguments are passed
270
- // via object properties, instead of individual arguments.
271
- if ($ level instanceof \Illuminate \Log \Events \MessageLogged) {
272
- $ message = $ level ->message ;
273
- $ context = $ level ->context ;
274
- $ level = $ level ->level ;
275
- }
276
-
264
+ function (\Illuminate \Log \Events \MessageLogged $ log ) use ($ logger ) {
277
265
try {
278
- $ logMessage = (string ) $ message ;
266
+ $ logMessage = (string ) $ log -> message ;
279
267
if (mb_check_encoding ($ logMessage , 'UTF-8 ' )) {
268
+ $ context = $ log ->context ;
280
269
$ logMessage .= (!empty ($ context ) ? ' ' . json_encode ($ context , JSON_PRETTY_PRINT ) : '' );
281
270
} else {
282
271
$ logMessage = "[INVALID UTF-8 DATA] " ;
@@ -285,8 +274,8 @@ function ($level, $message = null, $context = null) use ($logger) {
285
274
$ logMessage = "[Exception: " . $ e ->getMessage () . "] " ;
286
275
}
287
276
$ logger ->addMessage (
288
- '[ ' . date ('H:i:s ' ) . '] ' . "LOG. $ level: " . $ logMessage ,
289
- $ level ,
277
+ '[ ' . date ('H:i:s ' ) . '] ' . "LOG. { $ log -> level } : " . $ logMessage ,
278
+ $ log -> level ,
290
279
false
291
280
);
292
281
}
@@ -423,7 +412,7 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) use ($queryC
423
412
}
424
413
}
425
414
426
- if ($ this ->shouldCollect ('models ' , true )) {
415
+ if ($ this ->shouldCollect ('models ' , true ) && isset ( $ this -> app [ ' events ' ]) ) {
427
416
try {
428
417
$ this ->addCollector (new ObjectCountCollector ('models ' ));
429
418
$ this ->app ['events ' ]->listen ('eloquent.retrieved:* ' , function ($ event , $ models ) {
@@ -539,7 +528,7 @@ public function __toString(): string
539
528
}
540
529
}
541
530
542
- if ($ this ->shouldCollect ('jobs ' , false )) {
531
+ if ($ this ->shouldCollect ('jobs ' , false ) && isset ( $ this -> app [ ' events ' ]) ) {
543
532
try {
544
533
$ this ->addCollector (new ObjectCountCollector ('jobs ' , 'briefcase ' ));
545
534
$ this ->app ['events ' ]->listen (\Illuminate \Queue \Events \JobQueued::class, function ($ event ) {
@@ -687,7 +676,7 @@ protected function addCollectorException(string $message, Exception $exception)
687
676
* Returns a JavascriptRenderer for this instance
688
677
*
689
678
* @param string $baseUrl
690
- * @param string $basePathng
679
+ * @param string $basePath
691
680
* @return JavascriptRenderer
692
681
*/
693
682
public function getJavascriptRenderer ($ baseUrl = null , $ basePath = null )
@@ -1161,7 +1150,7 @@ protected function addServerTimingHeaders(Response $response)
1161
1150
$ collector = $ this ->getCollector ('time ' );
1162
1151
1163
1152
$ headers = [];
1164
- foreach ($ collector ->collect ()['measures ' ] as $ k => $ m ) {
1153
+ foreach ($ collector ->collect ()['measures ' ] as $ m ) {
1165
1154
$ headers [] = sprintf ('app;desc="%s";dur=%F ' , str_replace (array ("\n" , "\r" ), ' ' , str_replace ('" ' , "' " , $ m ['label ' ])), $ m ['duration ' ] * 1000 );
1166
1155
}
1167
1156
@@ -1186,12 +1175,7 @@ private function getRemoteServerReplacements()
1186
1175
*/
1187
1176
private function getMonologLogger ()
1188
1177
{
1189
- // The logging was refactored in Laravel 5.6
1190
- if ($ this ->checkVersion ('5.6 ' )) {
1191
- $ logger = $ this ->app ['log ' ]->getLogger ();
1192
- } else {
1193
- $ logger = $ this ->app ['log ' ]->getMonolog ();
1194
- }
1178
+ $ logger = $ this ->app ['log ' ]->getLogger ();
1195
1179
1196
1180
if (get_class ($ logger ) !== 'Monolog\Logger ' ) {
1197
1181
throw new Exception ('Logger is not a Monolog\Logger instance ' );
0 commit comments