Merge branch 'Seldaek:main' into include-extra-in-psr-handler

.gitattributes

@@ -6,3 +6,5 @@
 /_config.yml export-ignore
 /UPGRADE.md export-ignore
 /.editorconfig export-ignore
+/favicon.ico export-ignore
+/logo.jpg export-ignore

.gitignore

@@ -7,5 +7,3 @@ composer.lock
 .hg
 .phpunit.result.cache
 .phpunit.cache
-favicon.ico
-logo.jpg

README.md

@@ -19,6 +19,22 @@ make sure you can always use another compatible logger at a later time.
 As of 1.11.0 Monolog public APIs will also accept PSR-3 log levels.
 Internally Monolog still uses its own level scheme since it predates PSR-3.
 
+<div align="center">
+  <hr>
+  <sup><b>Sponsored by:</b></sup>
+  <br>
+  <a href="https://betterstack.com">
+    <div>
+      <img src="https://github.com/Seldaek/monolog/assets/183678/7de58ce0-2fa2-45c0-b3e8-e60cebb3c4cf" width="200" alt="Better Stack">
+    </div>
+    <div>
+      Better Stack lets you centralize, search, and visualize your logs.
+    </div>
+  </a>
+  <br>
+  <hr>
+</div>
+
 ## Installation
 
 Install the latest version with

doc/04-extending.md

@@ -23,6 +23,7 @@ abstract class provided by Monolog to keep things DRY.
 
 use Monolog\Level;
 use Monolog\Logger;
+use Monolog\LogRecord;
 use Monolog\Handler\AbstractProcessingHandler;
 
 class PDOHandler extends AbstractProcessingHandler

phpstan.neon.dist

@@ -14,8 +14,6 @@ parameters:
     ignoreErrors:
         - '#zend_monitor_|ZEND_MONITOR_#'
         - '#MongoDB\\(Client|Collection)#'
-        # Invalid type info on Redis multi
-        - '#^Cannot call method ltrim\(\) on int\|false.$#'
 
         # Cannot resolve this cleanly as different normalizers return different types but it is safe
         - message: '#Return type \(string\) of method Monolog\\Formatter\\LineFormatter::normalizeException\(\) should be compatible with return type \(array\) of method Monolog\\Formatter\\NormalizerFormatter::normalizeException\(\)#'

src/Monolog/Handler/RedisHandler.php

@@ -72,7 +72,7 @@ protected function writeCapped(LogRecord $record): void
             $mode = defined('Redis::MULTI') ? Redis::MULTI : 1;
             $this->redisClient->multi($mode)
                 ->rPush($this->redisKey, $record->formatted)
-                ->ltrim($this->redisKey, -$this->capSize, -1)
+                ->lTrim($this->redisKey, -$this->capSize, -1)
                 ->exec();
         } else {
             $redisKey = $this->redisKey;