Support Laravel 8.x

Author: erikn69

composer.json

@@ -18,11 +18,11 @@
     ],
     "require": {
         "php": "^8.1",
-        "php-debugbar/php-debugbar": "~2.1.1",
-        "illuminate/routing": "^9|^10|^11|^12",
-        "illuminate/session": "^9|^10|^11|^12",
-        "illuminate/support": "^9|^10|^11|^12",
-        "symfony/finder": "^6|^7"
+        "php-debugbar/php-debugbar": "^2.1",
+        "illuminate/routing": "^8.67|^9|^10|^11|^12",
+        "illuminate/session": "^8.67|^9|^10|^11|^12",
+        "illuminate/support": "^8.67|^9|^10|^11|^12",
+        "symfony/finder": "^5|^6|^7"
     },
     "require-dev": {
         "mockery/mockery": "^1.3.3",

src/DataCollector/FilesCollector.php

@@ -20,8 +20,9 @@
 use Barryvdh\Debugbar\Storage\SocketStorage;
 use Barryvdh\Debugbar\Storage\FilesystemStorage;
 use Barryvdh\Debugbar\Support\Clockwork\ClockworkCollector;
-use Barryvdh\Debugbar\Support\RequestIdGenerator;
 use DebugBar\Bridge\MonologCollector;
+use DebugBar\Bridge\SwiftMailer\SwiftLogCollector;
+use DebugBar\Bridge\SwiftMailer\SwiftMailCollector;
 use DebugBar\Bridge\Symfony\SymfonyMailCollector;
 use DebugBar\DataCollector\ConfigCollector;
 use DebugBar\DataCollector\DataCollectorInterface;
@@ -119,7 +120,6 @@ public function __construct($app = null)
         if ($this->is_lumen) {
             $this->version = Str::betweenFirst($app->version(), '(', ')');
         }
-        $this->setRequestIdGenerator(new RequestIdGenerator());
     }
 
     /**
@@ -473,17 +473,27 @@ function (\Illuminate\Database\Events\ConnectionEstablished $event) {
 
         if ($this->shouldCollect('mail', true) && class_exists('Illuminate\Mail\MailServiceProvider') && $events) {
             try {
-                $mailCollector = new SymfonyMailCollector();
+                if ($this->checkVersion('9.0')) {
+                    $mailCollector = new SymfonyMailCollector();
+                    $events->listen(function (MessageSent $event) use ($mailCollector) {
+                        $mailCollector->addSymfonyMessage($event->sent->getSymfonySentMessage());
+                    });
+                } else {
+                    $mailer = $app['mailer']->getSwiftMailer();
+                    $mailCollector = new SwiftMailCollector($mailer);
+
+                    if ($config->get('debugbar.options.mail.show_body') && $this->hasCollector('messages')) {
+                        $this['messages']->aggregate(new SwiftLogCollector($mailer));
+                    }
+                }
+
                 $this->addCollector($mailCollector);
-                $events->listen(function (MessageSent $event) use ($mailCollector) {
-                    $mailCollector->addSymfonyMessage($event->sent->getSymfonySentMessage());
-                });
 
                 if ($config->get('debugbar.options.mail.show_body') || $config->get('debugbar.options.mail.full_log')) {
                     $mailCollector->showMessageBody();
                 }
 
-                if ($this->hasCollector('time') && $config->get('debugbar.options.mail.timeline')) {
+                if ($this->hasCollector('time') && $config->get('debugbar.options.mail.timeline') && $this->checkVersion('9.0')) {
                     $transport = $app['mailer']->getSymfonyTransport();
                     $app['mailer']->setSymfonyTransport(new class ($transport, $this) extends AbstractTransport{
                         private $originalTransport;
@@ -514,7 +524,9 @@ public function __toString(): string
                     });
                 }
             } catch (Exception $e) {
-                $this->addCollectorException('Cannot add SymfonyMailCollector', $e);
+                $this->addCollectorException(
+                    'Cannot add '.($this->checkVersion('9.0')?'SymfonyMailCollector':'SwiftMailCollector'), $e
+                );
             }
         }
 
@@ -526,9 +538,6 @@ public function __toString(): string
                 $this->addCollectorException('Cannot add LogsCollector', $e);
             }
         }
-        if ($this->shouldCollect('files', false)) {
-            $this->addCollector(new FilesCollector($app));
-        }
 
         if ($this->shouldCollect('auth', false)) {
             try {