@@ -238,11 +238,8 @@ function () use ($debugbar, $startTime) {
238238 $ this ->addCollector (new ViewCollector ($ collectData , $ excludePaths , $ group ));
239239 $ this ->app ['events ' ]->listen (
240240 '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 ]);
246243 }
247244 );
248245 } catch (Exception $ e ) {
@@ -264,19 +261,11 @@ function ($view, $data = []) use ($debugbar) {
264261 $ logger = new MessagesCollector ('log ' );
265262 $ this ['messages ' ]->aggregate ($ logger );
266263 $ 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 ) {
277265 try {
278- $ logMessage = (string ) $ message ;
266+ $ logMessage = (string ) $ log -> message ;
279267 if (mb_check_encoding ($ logMessage , 'UTF-8 ' )) {
268+ $ context = $ log ->context ;
280269 $ logMessage .= (!empty ($ context ) ? ' ' . json_encode ($ context , JSON_PRETTY_PRINT ) : '' );
281270 } else {
282271 $ logMessage = "[INVALID UTF-8 DATA] " ;
@@ -285,8 +274,8 @@ function ($level, $message = null, $context = null) use ($logger) {
285274 $ logMessage = "[Exception: " . $ e ->getMessage () . "] " ;
286275 }
287276 $ logger ->addMessage (
288- '[ ' . date ('H:i:s ' ) . '] ' . "LOG. $ level: " . $ logMessage ,
289- $ level ,
277+ '[ ' . date ('H:i:s ' ) . '] ' . "LOG. { $ log -> level } : " . $ logMessage ,
278+ $ log -> level ,
290279 false
291280 );
292281 }
@@ -423,7 +412,7 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) use ($queryC
423412 }
424413 }
425414
426- if ($ this ->shouldCollect ('models ' , true )) {
415+ if ($ this ->shouldCollect ('models ' , true ) && isset ( $ this -> app [ ' events ' ]) ) {
427416 try {
428417 $ this ->addCollector (new ObjectCountCollector ('models ' ));
429418 $ this ->app ['events ' ]->listen ('eloquent.retrieved:* ' , function ($ event , $ models ) {
@@ -539,7 +528,7 @@ public function __toString(): string
539528 }
540529 }
541530
542- if ($ this ->shouldCollect ('jobs ' , false )) {
531+ if ($ this ->shouldCollect ('jobs ' , false ) && isset ( $ this -> app [ ' events ' ]) ) {
543532 try {
544533 $ this ->addCollector (new ObjectCountCollector ('jobs ' , 'briefcase ' ));
545534 $ this ->app ['events ' ]->listen (\Illuminate \Queue \Events \JobQueued::class, function ($ event ) {
@@ -687,7 +676,7 @@ protected function addCollectorException(string $message, Exception $exception)
687676 * Returns a JavascriptRenderer for this instance
688677 *
689678 * @param string $baseUrl
690- * @param string $basePathng
679+ * @param string $basePath
691680 * @return JavascriptRenderer
692681 */
693682 public function getJavascriptRenderer ($ baseUrl = null , $ basePath = null )
@@ -1161,7 +1150,7 @@ protected function addServerTimingHeaders(Response $response)
11611150 $ collector = $ this ->getCollector ('time ' );
11621151
11631152 $ headers = [];
1164- foreach ($ collector ->collect ()['measures ' ] as $ k => $ m ) {
1153+ foreach ($ collector ->collect ()['measures ' ] as $ m ) {
11651154 $ headers [] = sprintf ('app;desc="%s";dur=%F ' , str_replace (array ("\n" , "\r" ), ' ' , str_replace ('" ' , "' " , $ m ['label ' ])), $ m ['duration ' ] * 1000 );
11661155 }
11671156
@@ -1186,12 +1175,7 @@ private function getRemoteServerReplacements()
11861175 */
11871176 private function getMonologLogger ()
11881177 {
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 ();
11951179
11961180 if (get_class ($ logger ) !== 'Monolog\Logger ' ) {
11971181 throw new Exception ('Logger is not a Monolog\Logger instance ' );
0 commit comments