Merge pull request #478 from greg0ire/recent-psr-log

Use recent versions of psr/log and Monolog

Author: jaapio

composer.json

@@ -40,7 +40,7 @@
         "phpdocumentor/guides-restructured-text": "@dev",
         "phpdocumentor/guides-theme-bootstrap": "@dev",
         "psr/event-dispatcher": "^1.0",
-        "psr/log": "^1.1",
+        "psr/log": "^2.0 || ^3.0",
         "symfony/contracts": "^2.5 || ^3.0",
         "symfony/http-client": "^5.4.25 || ^6.3",
         "symfony/process": "^5.4 || ^6.3",

composer.lock

@@ -26,7 +26,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "monolog/monolog": "^2.9",
+        "monolog/monolog": "^2.9 || ^3.0",
         "phpdocumentor/guides": "self.version",
         "phpdocumentor/guides-restructured-text": "self.version",
         "symfony/config": "^5.4 || ^6.3",

packages/guides-cli/composer.json

@@ -4,6 +4,7 @@
 
 namespace phpDocumentor\Guides\Cli\Logger;
 
+use Monolog\LogRecord;
 use Monolog\Processor\ProcessorInterface;
 
 /**
@@ -20,8 +21,7 @@ public function hasBeenCalled(): bool
         return $this->hasBeenCalled;
     }
 
-    /** @inheritDoc */
-    public function __invoke(array $record): array
+    public function __invoke(array|LogRecord $record): array|LogRecord
     {
         $this->hasBeenCalled = true;
 

packages/guides-cli/src/Logger/SpyProcessor.php

@@ -34,6 +34,6 @@
         "webmozart/assert": "^1.11"
     },
     "require-dev": {
-        "psr/log": "^1.0"
+        "psr/log": "^2.0 || ^3.0"
     }
 }

packages/guides/composer.json

@@ -10,6 +10,7 @@
 use League\Flysystem\Memory\MemoryAdapter;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
+use Monolog\LogRecord;
 use phpDocumentor\Guides\ApplicationTestCase;
 use phpDocumentor\Guides\Compiler\Compiler;
 use phpDocumentor\Guides\Compiler\CompilerContext;
@@ -131,8 +132,8 @@ public function testFunctional(
             assert($logHandler instanceof TestHandler);
 
             $logRecords = array_map(
-                static fn (array $log) => $log['level_name'] . ': ' . $log['message'],
-                array_filter($logHandler->getRecords(), static fn (array $log) => $log['level'] >= Logger::WARNING),
+                static fn (array|LogRecord $log) => $log['level_name'] . ': ' . $log['message'],
+                array_filter($logHandler->getRecords(), static fn (array|LogRecord $log) => $log['level'] >= Logger::WARNING),
             );
             self::assertEquals($expectedLogs, $logRecords);
         } catch (ExpectationFailedException $e) {