feat: upgrade monolog/monolog to v3

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -5,3 +5,4 @@ log/html.log
 composer.lock
 /.php-cs-fixer.cache
 .phpunit.result.cache
+.direnv

composer.json

@@ -15,15 +15,15 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.1",
         "ext-curl": "*",
         "ext-tidy": "*",
         "fossar/htmlawed": "^1.2.8",
         "guzzlehttp/psr7": "^2.0",
         "j0k3r/graby-site-config": "^1.0.147",
         "j0k3r/httplug-ssrf-plugin": "^2.0",
-        "j0k3r/php-readability": "^1.2.9",
-        "monolog/monolog": "^1.18.0|^2.3",
+        "j0k3r/php-readability": "dev-master",
+        "monolog/monolog": "^3",
         "php-http/client-common": "^2.5",
         "php-http/discovery": "^1.14",
         "php-http/httplug": "^2.2",

flake.nix

@@ -0,0 +1,44 @@
+{
+  description = "Dev environment";
+
+  outputs = { self, nixpkgs }:
+    let pkgs = nixpkgs.legacyPackages.x86_64-linux;
+    in {
+      defaultPackage.x86_64-linux =
+        pkgs.mkShell {
+          buildInputs =  with pkgs; [
+            (php82.withExtensions
+              ({ all, ... }: with all; [
+                bz2
+                curl
+                dom
+                filter
+                fileinfo
+                gd
+                iconv
+                imagick
+                intl
+                mbstring
+                openssl
+                pdo
+                pdo_mysql
+                pdo_sqlite
+                session
+                sodium
+                sqlite3
+                tidy
+                tokenizer
+                xdebug
+                xmlwriter
+#                yaml
+                zip
+                zlib
+              ])
+            )
+            php82Packages.composer
+            libjpeg
+            libpng
+            libyaml
+        ]; };
+    };
+}

src/Monolog/Formatter/GrabyFormatter.php

@@ -5,6 +5,8 @@
 namespace Graby\Monolog\Formatter;
 
 use Monolog\Formatter\HtmlFormatter;
+use Monolog\Level;
+use Monolog\LogRecord;
 
 /**
  * Formats incoming records into an HTML table.
@@ -18,32 +20,32 @@ class GrabyFormatter extends HtmlFormatter
     /**
      * Formats a log record.
      *
-     * @param array $record A record to format
+     * @param LogRecord $record A record to format
      *
      * @return string The formatted record
      */
-    public function format(array $record): string
+    public function format(LogRecord $record): string
     {
         $output = '<table cellspacing="1" width="100%" class="monolog-output">';
 
-        $output .= $this->addRowWithLevel($record['level'], 'Time', $record['datetime']->format($this->dateFormat));
-        $output .= $this->addRowWithLevel($record['level'], 'Message', (string) $record['message']);
+        $output .= $this->addRowWithLevel($record->level, 'Time', $record->datetime->format($this->dateFormat));
+        $output .= $this->addRowWithLevel($record->level, 'Message', $record->message);
 
-        if ($record['context']) {
+        if ($record->context) {
             $embeddedTable = '<table cellspacing="1" width="100%">';
-            foreach ($record['context'] as $key => $value) {
-                $embeddedTable .= $this->addRowWithLevel($record['level'], $key, $this->convertToString($value));
+            foreach ($record->context as $key => $value) {
+                $embeddedTable .= $this->addRowWithLevel($record->level, $key, $this->convertToString($value));
             }
             $embeddedTable .= '</table>';
-            $output .= $this->addRowWithLevel($record['level'], 'Context', $embeddedTable, false);
+            $output .= $this->addRowWithLevel($record->level, 'Context', $embeddedTable, false);
         }
-        if ($record['extra']) {
+        if ($record->extra) {
             $embeddedTable = '<table cellspacing="1" width="100%">';
-            foreach ($record['extra'] as $key => $value) {
-                $embeddedTable .= $this->addRowWithLevel($record['level'], $key, $this->convertToString($value));
+            foreach ($record->extra as $key => $value) {
+                $embeddedTable .= $this->addRowWithLevel($record->level, $key, $this->convertToString($value));
             }
             $embeddedTable .= '</table>';
-            $output .= $this->addRowWithLevel($record['level'], 'Extra', $embeddedTable, false);
+            $output .= $this->addRowWithLevel($record->level, 'Extra', $embeddedTable, false);
         }
 
         return $output . '</table>';
@@ -61,18 +63,18 @@ protected function convertToString($data): string
     /**
      * Creates an HTML table row with background cellon title cell.
      *
-     * @param int    $level    Error level
+     * @param Level  $level    Error level
      * @param string $th       Row header content
      * @param string $td       Row standard cell content
      * @param bool   $escapeTd false if td content must not be html escaped
      */
-    private function addRowWithLevel(int $level, string $th, string $td = ' ', bool $escapeTd = true): string
+    private function addRowWithLevel(Level $level, string $th, string $td = ' ', bool $escapeTd = true): string
     {
         $th = htmlspecialchars($th, \ENT_NOQUOTES, 'UTF-8');
         if ($escapeTd) {
             $td = '<pre>' . htmlspecialchars($td, \ENT_NOQUOTES, 'UTF-8') . '</pre>';
         }
 
-        return "<tr style=\"padding: 4px;spacing: 0;text-align: left;\">\n<th style=\"background:" . $this->logLevels[$level] . "\" width=\"100px\">$th:</th>\n<td style=\"padding: 4px;spacing: 0;text-align: left;background: #eeeeee\">" . $td . "</td>\n</tr>";
+        return "<tr style=\"padding: 4px;spacing: 0;text-align: left;\">\n<th style=\"background:" . $this->getLevelColor($level) . "\" width=\"100px\">$th:</th>\n<td style=\"padding: 4px;spacing: 0;text-align: left;background: #eeeeee\">" . $td . "</td>\n</tr>";
     }
 }

src/Monolog/Handler/GrabyHandler.php

@@ -7,6 +7,7 @@
 use Graby\Monolog\Formatter\GrabyFormatter;
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Logger;
+use Monolog\LogRecord;
 use Monolog\Processor\PsrLogMessageProcessor;
 
 /**
@@ -45,9 +46,9 @@ public function hasRecords($level): bool
         return isset($this->recordsByLevel[$level]);
     }
 
-    protected function write(array $record): void
+    protected function write(LogRecord $record): void
     {
-        $this->recordsByLevel[$record['level']][] = $record;
+        $this->recordsByLevel[$record->level->value][] = $record;
         $this->records[] = $record;
     }
 }