Fix psalm, clear psalm-baseline.yaml: Test, Http, Sentry, Sender.php

src/Command/Test.php

@@ -28,6 +28,7 @@ final class Test extends Command
     private string $addr = '127.0.0.1';
     private int $port = 9912;
 
+    /** @psalm-suppress PropertyNotSetInConstructor */
     private Logger $logger;
 
     protected function execute(
@@ -197,14 +198,15 @@ private function sendMailPackage(
             $output->write(
                 '> ' . \str_replace(["\r", "\n"], ["\e[32m\\r\e[0m", "\e[32m\\n\e[0m"], $content),
                 true,
-                $output::OUTPUT_RAW,
+                OutputInterface::OUTPUT_RAW,
             );
         }
 
         if ($expectedResponsePrefix === '') {
             return;
         }
         @\socket_recv($socket, $buf, 65536, 0);
+        /** @var string|null $buf */
         if ($buf === null) {
             $output->writeln('<error>Disconnected</>');
             return;
@@ -214,7 +216,7 @@ private function sendMailPackage(
             "\e[33m< \"%s\"\e[0m",
             \str_replace(["\r", "\n"], ["\e[32m\\r\e[33m", "\e[32m\\n\e[33m"], $buf)),
             true,
-            $output::OUTPUT_RAW,
+            OutputInterface::OUTPUT_RAW,
         );
 
         $prefix = \substr($buf, 0, \strlen($expectedResponsePrefix));
@@ -245,7 +247,7 @@ private function sendContent(string $file): void
         } catch (\Throwable $e) {
             $this->logger->exception($e, "$file sending error", important: true);
         } finally {
-            if (isset($fp) && \is_resource($fp)) {
+            if (isset($fp)) {
                 @\flock($fp, LOCK_UN);
                 @\fclose($fp);
             }

src/Handler/Http/Handler/Fallback.php

@@ -10,7 +10,6 @@
 use Buggregator\Trap\Handler\Pipeline;
 use Buggregator\Trap\Proto\Frame;
 use Buggregator\Trap\Traffic\StreamClient;
-use DateTimeInterface;
 use Nyholm\Psr7\Response;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -43,8 +42,9 @@ public function __construct(
 
     public function handle(StreamClient $streamClient, ServerRequestInterface $request, callable $next): iterable
     {
-        $time = $request->getAttribute('begin_at', null);
-        $time = $time instanceof DateTimeInterface ? $time : new \DateTimeImmutable();
+        /** @var mixed $time */
+        $time = $request->getAttribute('begin_at');
+        $time = $time instanceof \DateTimeImmutable ? $time : new \DateTimeImmutable();
         $gotFrame = false;
 
         try {
@@ -68,13 +68,12 @@ public function handle(StreamClient $streamClient, ServerRequestInterface $reque
                         throw new \RuntimeException('Invalid response type.');
                     }
 
+                    HttpEmitter::emit($streamClient, $response);
                     break;
                 }
 
                 \Fiber::suspend();
             } while (true);
-
-            HttpEmitter::emit($streamClient, $response);
         } catch (\Throwable) {
             // Emit error response
             HttpEmitter::emit($streamClient, new Response(500));

src/Handler/Http/Handler/Websocket.php

@@ -31,7 +31,8 @@ public function handle(StreamClient $streamClient, ServerRequestInterface $reque
         }
 
         // Get the time of the request
-        $time = $request->getAttribute('begin_at', null);
+        /** @var mixed $time */
+        $time = $request->getAttribute('begin_at');
         $time = $time instanceof \DateTimeImmutable ? $time : new \DateTimeImmutable();
 
         // Calculate the accept key for the handshake

src/Handler/Http/Middleware/SentryTrap.php

@@ -15,6 +15,8 @@
 /**
  * @internal
  * @psalm-internal Buggregator\Trap
+ *
+ * @psalm-import-type SentryStoreMessage from Frame\Sentry\SentryStore
  */
 final class SentryTrap implements Middleware
 {
@@ -64,7 +66,12 @@ public function processEnvelope(ServerRequestInterface $request): ResponseInterf
         }
 
         $request->getBody()->rewind();
-        $frame = EnvelopeParser::parse($request->getBody(), $request->getAttribute('begin_at', null));
+
+        /** @var mixed $time */
+        $time = $request->getAttribute('begin_at');
+        $time = $time instanceof \DateTimeImmutable ? $time : new \DateTimeImmutable();
+
+        $frame = EnvelopeParser::parse($request->getBody(), $time);
         Fiber::suspend($frame);
 
         return new Response(200);
@@ -77,13 +84,17 @@ private function processStore(ServerRequestInterface $request): ResponseInterfac
             // Reject too big content
             return new Response(413);
         }
-
+        /** @var SentryStoreMessage $payload */
         $payload = \json_decode((string)$request->getBody(), true, 96, \JSON_THROW_ON_ERROR);
 
+        /** @psalm-suppress MixedAssignment */
+        $time = $request->getAttribute('begin_at');
+        $time = $time instanceof \DateTimeImmutable ? $time : new \DateTimeImmutable();
+
         Fiber::suspend(
             new Frame\Sentry\SentryStore(
                 message: $payload,
-                time: $request->getAttribute('begin_at', null),
+                time: $time,
             )
         );
 

src/Proto/Frame/Sentry.php

@@ -12,16 +12,28 @@
 /**
  * @internal
  * @psalm-internal Buggregator
+ *
+ * @psalm-import-type SentryStoreMessage from Sentry\SentryStore
+ * @psalm-import-type SentryEnvelopeMessage from Sentry\SentryEnvelope
  */
 abstract class Sentry extends Frame
 {
-    public static function fromString(string $payload, DateTimeImmutable $time): static
+    final public static function fromString(string $payload, DateTimeImmutable $time): static
     {
+        static::class === self::class or throw new \LogicException(
+            \sprintf('Factory method must be called from %s class.', self::class),
+        );
+
+        /** @var array{type: string, ...mixed} $data */
         $data = \json_decode($payload, true, 512, JSON_THROW_ON_ERROR);
-        return match (true) {
-            $data['type'] === SentryEnvelope::SENTRY_FRAME_TYPE => SentryEnvelope::fromArray($data, $time),
-            $data['type'] === SentryStore::SENTRY_FRAME_TYPE => SentryStore::fromArray($data, $time),
+
+        /** @psalm-suppress InvalidArgument */
+        $result = match ($data['type']) {
+            SentryEnvelope::SENTRY_FRAME_TYPE => SentryEnvelope::fromArray($data, $time),
+            SentryStore::SENTRY_FRAME_TYPE => SentryStore::fromArray($data, $time),
             default => throw new \InvalidArgumentException('Unknown Sentry frame type.'),
         };
+
+        return $result;
     }
 }

src/Proto/Frame/Sentry/SentryEnvelope.php

@@ -12,6 +12,12 @@
 /**
  * @internal
  * @psalm-internal Buggregator
+ *
+ * @psalm-type SentryEnvelopeMessage = array{
+ *     type: SentryEnvelope::SENTRY_FRAME_TYPE,
+ *     items: array<array-key, array{array<array-key, mixed>, mixed}>,
+ *     headers: array<string, string>
+ * }
  */
 final class SentryEnvelope extends Frame\Sentry
 {
@@ -39,6 +45,11 @@ public function __toString(): string
         );
     }
 
+    /**
+     * @psalm-assert SentryEnvelopeMessage $data
+     *
+     * @param SentryEnvelopeMessage $data
+     */
     public static function fromArray(array $data, DateTimeImmutable $time): static
     {
         $items = [];

src/Proto/Frame/Sentry/SentryStore.php

@@ -12,39 +12,42 @@
 /**
  * @internal
  * @psalm-internal Buggregator
+ *
+ * @psalm-type SentryStoreMessage=array{
+ *     type: SentryStore::SENTRY_FRAME_TYPE,
+ *     event_id: non-empty-string,
+ *     timestamp: positive-int,
+ *     platform?: non-empty-string,
+ *     sdk?: array{
+ *          name: non-empty-string,
+ *          version: non-empty-string,
+ *     },
+ *     logger?: non-empty-string,
+ *     contexts?: array<non-empty-string, array<non-empty-string, non-empty-string>>,
+ *     environment?: non-empty-string,
+ *     server_name?: non-empty-string,
+ *     transaction?: non-empty-string,
+ *     modules?: array<non-empty-string, non-empty-string>,
+ *     exception?: array<array-key, array{
+ *         type: non-empty-string,
+ *         value: non-empty-string,
+ *         stacktrace: array{
+ *             frames: array<array-key, array{
+ *                 filename: non-empty-string,
+ *                 lineno: positive-int,
+ *                 abs_path: non-empty-string,
+ *                 context_line: non-empty-string
+ *             }>
+ *         }
+ *     }>
+ * }
  */
 final class SentryStore extends Frame\Sentry
 {
     public const SENTRY_FRAME_TYPE = 'store';
 
     /**
-     * @param array{
-     *     event_id: non-empty-string,
-     *     timestamp: positive-int,
-     *     platform?: non-empty-string,
-     *     sdk?: array{
-     *         name: non-empty-string,
-     *         version: non-empty-string,
-     *     },
-     *     logger?: non-empty-string,
-     *     contexts?: array<non-empty-string, array<non-empty-string, non-empty-string>>,
-     *     environment?: non-empty-string,
-     *     server_name?: non-empty-string,
-     *     transaction?: non-empty-string,
-     *     modules?: array<non-empty-string, non-empty-string>,
-     *     exception?: array<array-key, array{
-     *         type: non-empty-string,
-     *         value: non-empty-string,
-     *         stacktrace: array{
-     *             frames: array<array-key, array{
-     *                 filename: non-empty-string,
-     *                 lineno: positive-int,
-     *                 abs_path: non-empty-string,
-     *                 context_line: non-empty-string
-     *             }
-     *         }
-     *     }>
-     * } $message
+     * @param SentryStoreMessage $message
      */
     public function __construct(
         public readonly array $message,
@@ -61,6 +64,11 @@ public function __toString(): string
         return Json::encode($this->message);
     }
 
+    /**
+     * @psalm-assert SentryStoreMessage $data
+     *
+     * @param SentryStoreMessage $data
+     */
     public static function fromArray(array $data, DateTimeImmutable $time): static
     {
         return new self($data, $time);

src/Sender.php

@@ -12,7 +12,7 @@
 interface Sender
 {
     /**
-     * @param iterable<int, Frame> $frames
+     * @param iterable<array-key, Frame> $frames
      */
     public function send(iterable $frames): void;
 }

src/Sender/Console/Renderer/Http.php

@@ -84,10 +84,13 @@ private function renderData(OutputInterface $output, Frame\Http $frame): void
             foreach ($uploadedFiles as $name => $fileSet) {
                 $fileSet = \is_array($fileSet) ? $fileSet : [$fileSet];
                 foreach ($fileSet as $subName => $file) {
+                    /** @var int<0, max>|null $size */
+                    $size = $file->getSize();
+
                     Files::renderFile(
                         $output,
                         (string)$file->getClientFilename(),
-                        $file->getSize(),
+                        $size,
                         (string)$file->getClientMediaType(),
                         Field: \sprintf("%s[%s]", $name, $subName)
                     );

src/Sender/Console/Support/Common.php

@@ -66,6 +66,7 @@ public static function renderMetadata(OutputInterface $output, array $data): voi
             \array_keys($data)),
         );
 
+        /** @var mixed $value */
         foreach ($data as $head => $value) {
             // Align headers to the right
             self::renderHeader(

src/Traffic/Message/Multipart/File.php

@@ -95,7 +95,7 @@ public function moveTo(string $targetPath): void
     }
 
     /**
-     * @return non-negative-int|null
+     * @return int<0, max>|null
      */
     public function getSize(): ?int
     {