Merge branch '2.x'

2025-10-21 16:46:11 +02:00 · 2022-07-22 15:51:15 +02:00
parent 1ae4f609ba cf0f4b3814
commit 7684fae8fa
21 changed files with 181 additions and 42 deletions
--- a/tests/Monolog/Formatter/NormalizerFormatterTest.php
+++ b/tests/Monolog/Formatter/NormalizerFormatterTest.php
@@ -364,8 +364,10 @@ class NormalizerFormatterTest extends TestCase
        $record = $this->getRecord(context: ['exception' => $e]);
        $result = $formatter->format($record);

+        // See https://github.com/php/php-src/issues/8810 fixed in PHP 8.2
+        $offset = PHP_VERSION_ID >= 80200 ? 13 : 11;
        $this->assertSame(
-            __FILE__.':'.(__LINE__-9),
+            __FILE__.':'.(__LINE__ - $offset),
            $result['context']['exception']['trace'][0]
        );
    }