DEP PHP Support in CMS5

code/Bridge/MonologCollector.php

@@ -0,0 +1,108 @@
+<?php
+
+namespace LeKoala\DebugBar\Bridge;
+
+use DebugBar\DataCollector\DataCollectorInterface;
+use DebugBar\DataCollector\MessagesAggregateInterface;
+use DebugBar\DataCollector\Renderable;
+use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Logger;
+use Monolog\LogRecord;
+
+/**
+ * A monolog handler as well as a data collector. Based on DebugBar\Bridge\MonologCollector
+ * Note: This class is a temporary solution to keep existing dependencies working.
+ * As soon as maximebf/php-debugbar is updated and compatible with monolog/monolog:^3
+ * this class will be deprecated and removed immediately.
+ * <code>
+ * $debugbar->addCollector(new MonologCollector($logger));
+ * </code>
+ */
+class MonologCollector extends AbstractProcessingHandler implements DataCollectorInterface, Renderable, MessagesAggregateInterface
+{
+    protected $name;
+
+    protected $records = array();
+
+    /**
+     * @param Logger $logger
+     * @param int $level
+     * @param boolean $bubble
+     * @param string $name
+     */
+    public function __construct(Logger $logger = null, $level = Logger::DEBUG, $bubble = true, $name = 'monolog')
+    {
+        parent::__construct($level, $bubble);
+        $this->name = $name;
+        if ($logger !== null) {
+            $this->addLogger($logger);
+        }
+    }
+
+    /**
+     * Adds logger which messages you want to log
+     *
+     * @param Logger $logger
+     */
+    public function addLogger(Logger $logger)
+    {
+        $logger->pushHandler($this);
+    }
+
+    protected function write(LogRecord $record): void
+    {
+        $this->records[] = array(
+            'message' => $record['formatted'],
+            'is_string' => true,
+            'label' => strtolower($record['level_name']),
+            'time' => $record['datetime']->format('U')
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getMessages()
+    {
+        return $this->records;
+    }
+
+    /**
+     * @return array
+     */
+    public function collect()
+    {
+        return array(
+            'count' => count($this->records),
+            'records' => $this->records
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return array
+     */
+    public function getWidgets()
+    {
+        $name = $this->getName();
+        return array(
+            $name => array(
+                "icon" => "suitcase",
+                "widget" => "PhpDebugBar.Widgets.MessagesWidget",
+                "map" => "$name.records",
+                "default" => "[]"
+            ),
+            "$name:badge" => array(
+                "map" => "$name.count",
+                "default" => "null"
+            )
+        );
+    }
+}

code/DebugBar.php

@@ -15,10 +15,10 @@
 use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\View\Requirements;
 use SilverStripe\Control\Controller;
-use DebugBar\Bridge\MonologCollector;
+use LeKoala\DebugBar\Bridge\MonologCollector;
 use SilverStripe\Control\HTTPRequest;
 use DebugBar\DebugBar as BaseDebugBar;
-use SilverStripe\Control\Email\Mailer;
+use Symfony\Component\Mailer\MailerInterface;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Config\ConfigLoader;
 use SilverStripe\Core\Config\Configurable;
@@ -208,7 +208,7 @@ public static function initDebugBar()
 
         // Email logging
         if (self::config()->email_collector) {
-            $mailer = Injector::inst()->get(Mailer::class);
+            $mailer = Injector::inst()->get(MailerInterface::class);
             if ($mailer instanceof SwiftMailer) {
                 $swiftInst = $mailer->getSwiftMailer();
                 $debugbar['messages']->aggregate(new SwiftLogCollector($swiftInst));

code/Messages/LogFormatter.php

@@ -3,13 +3,14 @@
 namespace LeKoala\DebugBar\Messages;
 
 use Monolog\Formatter\FormatterInterface;
+use Monolog\LogRecord;
 
 /**
  * Formats incoming log messages for display in the debug bar
  */
 class LogFormatter implements FormatterInterface
 {
-    public function format(array $record)
+    public function format(array|LogRecord $record)
     {
         return $record['message'];
     }

composer.json

@@ -16,17 +16,17 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.0",
-        "maximebf/debugbar": "^1.13",
+        "php": "^8.1",
+        "silverstripe/framework": "^5",
+        "maximebf/debugbar": "^1.18",
         "jdorn/sql-formatter": "1.3.x-dev",
-        "tractorcow/silverstripe-proxy-db": "^1.0"
+        "silverstripe/silverstripe-proxy-db": "^2"
     },
     "require-dev": {
-        "silverstripe/siteconfig": "^4.0",
-        "silverstripe/admin": "^1.0",
+        "silverstripe/siteconfig": "^5",
+        "silverstripe/admin": "^2",
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.5"
+        "squizlabs/php_codesniffer": "^3"
     },
     "extra": {
         "branch-alias": {