resolved conflicts

docker/statistics/vendor/monolog/monolog/CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/CHANGELOG.md
 ### 3.9.0 (2025-03-24)
 
   * BC Warning: Fixed SendGridHandler to use the V3 API as V2 is now shut down, but this requires a new API key (#1952)
@@ -7,6 +8,8 @@
   * Fixed date format in ElasticsearchFormatter to use +00:00 vs +0000 tz identifiers (#1942)
   * Fixed GelfMessageFormatter handling numeric context/extra keys (#1932)
 
+=======
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/CHANGELOG.md
 ### 3.8.1 (2024-12-05)
 
   * Deprecated Monolog\DateTimeImmutable in favor of Monolog\JsonSerializableDateTimeImmutable (#1928)

docker/statistics/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php

@@ -115,7 +115,11 @@ class GelfMessageFormatter extends NormalizerFormatter
         }
 
         foreach ($extra as $key => $val) {
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
             $key = (string) preg_replace('#[^\w.-]#', '-', (string) $key);
+=======
+            $key = (string) preg_replace('#[^\w\.\-]#', '-', $key);
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
             $val = \is_scalar($val) || null === $val ? $val : $this->toJson($val);
             $len = \strlen($this->extraPrefix . $key . $val);
             if ($len > $this->maxLength) {
@@ -127,7 +131,11 @@ class GelfMessageFormatter extends NormalizerFormatter
         }
 
         foreach ($context as $key => $val) {
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
             $key = (string) preg_replace('#[^\w.-]#', '-', (string) $key);
+=======
+            $key = (string) preg_replace('#[^\w\.\-]#', '-', $key);
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
             $val = \is_scalar($val) || null === $val ? $val : $this->toJson($val);
             $len = \strlen($this->contextPrefix . $key . $val);
             if ($len > $this->maxLength) {

docker/statistics/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php

@@ -161,10 +161,13 @@ class BufferHandler extends AbstractHandler implements ProcessableHandlerInterfa
         }
 
         throw new \UnexpectedValueException('The nested handler of type '.\get_class($this->handler).' does not support formatters.');
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
     }
 
     public function setHandler(HandlerInterface $handler): void
     {
         $this->handler = $handler;
+=======
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
     }
 }

docker/statistics/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php

@@ -27,12 +27,20 @@ class ErrorLogHandler extends AbstractProcessingHandler
     public const OPERATING_SYSTEM = 0;
     public const SAPI = 4;
 
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
     /** @var 0|4 */
+=======
+    /** @var 0|1|3|4 */
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
     protected int $messageType;
     protected bool $expandNewlines;
 
     /**
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
      * @param 0|4 $messageType    Says where the error should go.
+=======
+     * @param 0|1|3|4 $messageType    Says where the error should go.
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
      * @param bool $expandNewlines If set to true, newlines in the message will be expanded to be take multiple log entries
      *
      * @throws \InvalidArgumentException If an unsupported message type is set

docker/statistics/vendor/monolog/monolog/src/Monolog/JsonSerializableDateTimeImmutable.php

@@ -11,8 +11,14 @@
 
 namespace Monolog;
 
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/JsonSerializableDateTimeImmutable.php
+class_alias(JsonSerializableDateTimeImmutable::class, 'Monolog\DateTimeImmutable');
+
+<<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/JsonSerializableDateTimeImmutable.php
+=======
 use DateTimeZone;
 
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/JsonSerializableDateTimeImmutable.php
 /**
  * Overrides default json encoding of date time objects
  *
@@ -44,5 +50,17 @@ class JsonSerializableDateTimeImmutable extends \DateTimeImmutable implements \J
     public function __toString(): string
     {
         return $this->jsonSerialize();
+<<<<<<< HEAD:docker/statistics/vendor/monolog/monolog/src/Monolog/JsonSerializableDateTimeImmutable.php
+========
+// @phpstan-ignore-next-line
+if (false) {
+    /**
+     * @deprecated Use \Monolog\JsonSerializableDateTimeImmutable instead.
+     */
+    class DateTimeImmutable extends JsonSerializableDateTimeImmutable
+    {
+>>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php
+=======
+>>>>>>> c7fdd2968a4cf2ead466c6ccaa09e8b2557fb582:docker/streamline-src/vendor/monolog/monolog/src/Monolog/JsonSerializableDateTimeImmutable.php
     }
 }

docker/statistics/vendor/monolog/monolog/src/Monolog/Test/MonologTestCase.php

@@ -17,6 +17,7 @@ use Monolog\LogRecord;
 use Monolog\JsonSerializableDateTimeImmutable;
 use Monolog\Formatter\FormatterInterface;
 use Psr\Log\LogLevel;
+use ReflectionProperty;
 
 /**
  * Lets you easily generate log records and a dummy formatter for testing purposes