chore: fix psalm issues

src/Handler/Http/Middleware/XHProfTrap.php

@@ -70,18 +70,17 @@ private function processStore(ServerRequestInterface $request): ResponseInterfac
  /** @var XHProfMessage $payload */
  $payload = \json_decode((string) $request->getBody(), true, 96, \JSON_THROW_ON_ERROR);
 
+ \is_array($payload['profile'] ?? null) && \is_array($payload['tags'] ?? null)
+ or throw new \InvalidArgumentException('Invalid payload');
+
  $metadata = $payload;
  unset($metadata['profile'], $metadata['tags'], $metadata['date']);
 
- isset($payload['profile'], $payload['tags'])
- && \is_array($payload['profile'])
- && \is_array($payload['tags'])
- or throw new \InvalidArgumentException('Invalid payload');
-
- /** @psalm-suppress MixedAssignment */
+ /** @var mixed $time */
  $time = $request->getAttribute('begin_at');
  $time = $time instanceof \DateTimeImmutable ? $time : new \DateTimeImmutable();
 
+ /** @psalm-suppress MixedArgumentTypeCoercion */
  \Fiber::suspend(
  new Frame\Profiler(
  payload: Frame\Profiler\Payload::new(

src/Module/Profiler/Struct/Profile.php

@@ -9,6 +9,7 @@
  * app_name?: string,
  * hostname?: string,
  * filename?: string,
+ * filesize?: int<0, max>,
  * ...
  * }
  *
@@ -30,6 +31,7 @@
 final class Profile implements \JsonSerializable
 {
  public Peaks $peaks;
+ public Tree $calls;
 
  /**
  * @param Metadata $metadata
@@ -40,9 +42,10 @@ public function __construct(
  public \DateTimeInterface $date = new \DateTimeImmutable(),
  public array $metadata = [],
  public array $tags = [],
- public Tree $calls = new Tree(),
+ ?Tree $calls = null,
  ?Peaks $peaks = null,
  ) {
+ $this->calls = $calls ?? new Tree();
  if ($peaks === null) {
  $this->peaks = new Peaks();
 
@@ -57,38 +60,40 @@ public function __construct(
 
  /**
  * @param ProfileData $data
+ * @psalm-suppress all
  */
  public static function fromArray(array $data): self
  {
  $metadata = $data;
  unset($metadata['tags'], $metadata['peaks'], $metadata['total_edges'], $metadata['date']);
 
- $self = new self(
+ return new self(
  date: new \DateTimeImmutable('@' . $data['date']),
  metadata: $metadata,
  tags: $data['tags'],
  // todo calls from edges
  peaks: Peaks::fromArray($data['peaks']),
  );
-
- return $self;
  }
 
  /**
  * @return ProfileData
+ * @psalm-suppress all
  */
  public function jsonSerialize(): array
  {
+ /** @var array<non-empty-string, array> $edges */
+ $edges = \iterator_to_array($this->calls->getItemsSortedV1(
+ static fn(Branch $a, Branch $b): int => $b->item->cost->wt <=> $a->item->cost->wt,
+ ));
  return [
  'date' => $this->date->getTimestamp(),
  'app_name' => $this->metadata['app_name'] ?? '',
  'hostname' => $this->metadata['hostname'] ?? '',
  'filename' => $this->metadata['filename'] ?? '',
  'tags' => $this->tags,
  'peaks' => $this->peaks,
- 'edges' => \iterator_to_array($this->calls->getItemsSortedV1(
- static fn(Branch $a, Branch $b): int => $b->item->cost->wt <=> $a->item->cost->wt,
- )),
+ 'edges' => $edges,
  'total_edges' => $this->calls->count(),
  ];
  }

src/Proto/Frame/Profiler.php

@@ -4,13 +4,13 @@
 
 namespace Buggregator\Trap\Proto\Frame;
 
+use Buggregator\Trap\Module\Profiler\Struct\Profile;
 use Buggregator\Trap\Proto\Frame;
 use Buggregator\Trap\ProtoType;
 use Buggregator\Trap\Support\Json;
 
 /**
- * @psalm-import-type Calls from \Buggregator\Trap\Proto\Frame\Profiler\Payload
- * @psalm-import-type Metadata from \Buggregator\Trap\Proto\Frame\Profiler\Payload
+ * @psalm-import-type ProfileData from Profile
  *
  * @internal
  * @psalm-internal Buggregator
@@ -26,7 +26,7 @@ public function __construct(
 
  public static function fromString(string $payload, \DateTimeImmutable $time): static
  {
- /** @var array{type: non-empty-string}&Calls&Metadata $data */
+ /** @var array{type: non-empty-string}|ProfileData $data */
  $data = Json::decode($payload);
 
  return new self(Frame\Profiler\Payload::fromArray($data), $time);

src/Proto/Frame/Profiler/Payload.php

@@ -45,15 +45,21 @@ public static function new(
  }
 
  /**
- * @param array{type: non-empty-string}&ProfileData $data
+ * @param array{type: non-empty-string}|ProfileData $data
  */
  public static function fromArray(array $data, ?PayloadType $type = null): static
  {
- /** @var \Closure(): Profile $provider */
+ /**
+ * @var \Closure(): Profile $provider
+ * @psalm-suppress all
+ */
  $provider = static fn(): Profile => Profile::fromArray($data);
 
+ /** @psalm-suppress all */
+ $type ??= PayloadType::from($data['type']);
+
  return new self(
- $type ?? PayloadType::from($data['type']),
+ $type,
  $provider,
  );
  }
@@ -64,15 +70,15 @@ public function getProfile(): Profile
  }
 
  /**
- * @return array{type: non-empty-string}&ProfileData
+ * @return array{type: non-empty-string}|ProfileData
  */
  public function toArray(): array
  {
  return ['type' => $this->type->value] + $this->getProfile()->jsonSerialize();
  }
 
  /**
- * @return array{type: non-empty-string}&ProfileData
+ * @return array{type: non-empty-string}|ProfileData
  */
  public function jsonSerialize(): array
  {

src/Sender/Console/Renderer/Profiler.php

@@ -24,6 +24,9 @@ public function isSupport(Frame $frame): bool
  return $frame->type === ProtoType::Profiler;
  }
 
+ /**
+ * @psalm-suppress MixedAssignment
+ */
  public function render(OutputInterface $output, Frame $frame): void
  {
  \assert($frame instanceof Frame\Profiler);
@@ -37,11 +40,11 @@ public function render(OutputInterface $output, Frame $frame): void
  $data = [];
  isset($metadata['date']) && \is_numeric($metadata['date'])
  and $data['Time'] = new \DateTimeImmutable('@' . $metadata['date']);
- isset($metadata['app_name']) and $data['App name'] = $metadata['app_name'];
- isset($metadata['hostname']) and $data['Hostname'] = $metadata['hostname'];
- isset($metadata['filename']) and $data['File name'] = $metadata['filename'] . (
- isset($metadata['filesize']) && \is_int($metadata['filesize'])
- ? ' (' . Measure::memory($metadata['filesize']) . ')'
+ \is_string($m = $metadata['app_name'] ?? null) and $data['App name'] = $m;
+ \is_string($m = $metadata['hostname'] ?? null) and $data['Hostname'] = $m;
+ \is_string($m = $metadata['filename'] ?? null) and $data['File name'] = $m . (
+ \is_int($m = $metadata['filesize'] ?? null) && $m >= 0
+ ? ' (' . Measure::memory($m) . ')'
  : ''
  );
  $data['Num edges'] = $profile->calls->count();

src/Sender/Console/Renderer/Smtp.php

@@ -89,7 +89,7 @@ public function render(OutputInterface $output, Frame $frame): void
  \array_map(static fn($attach) => [
  'CID' => $attach->getEmbeddingId(),
  'Name' => $attach->getClientFilename(),
- 'Size' => Measure::memory($attach->getSize()),
+ 'Size' => $attach->getSize() === null ? 'unknown size' : Measure::memory($attach->getSize()),
  'MIME' => $attach->getClientMediaType(),
  ], $embeddings),
  'compact',

src/Sender/Console/Support/Files.php

@@ -42,7 +42,7 @@ public static function renderFile(
  : \str_pad(\substr($fileName, $dotPos + 1), 3, ' ', \STR_PAD_BOTH);
 
  // File size
- $sizeStr = Measure::memory($size) ?? 'unknown size';
+ $sizeStr = $size === null ? 'unknown size' : Measure::memory($size);
 
  // Header with top border
  $output->writeln("<bg=black;fg=magenta> ┌───┐</> <info>$fileName</info>");

src/Sender/Console/Support/Tables.php

@@ -44,7 +44,7 @@ public static function renderKeyValueTable(OutputInterface $output, string $titl
  }
 
  /**
- * @param array<array-key, array<array-key, scalar>> $data
+ * @param array<array-key, array<array-key, scalar|null>> $data
  * @param 'default'|'borderless'|'compact'|'symfony-style-guide'|'box'|'box-double' $style
  */
  public static function renderMultiColumnTable(

src/Sender/Frontend/Event.php

@@ -14,7 +14,7 @@ final class Event implements \JsonSerializable
  /**
  * @param non-empty-string $uuid
  * @param non-empty-string $type
- * @param \ArrayAccess<non-empty-string, Asset>|null $assets
+ * @param \ArrayAccess<non-empty-string, Asset>&\Traversable<non-empty-string, Asset>|null $assets
  */
  public function __construct(
  public readonly string $uuid,

src/Sender/Frontend/Mapper/HttpRequest.php

@@ -19,7 +19,7 @@ public function map(HttpFrame $frame): Event
  $request = $frame->request;
 
  $uri = \ltrim($request->getUri()->getPath(), '/');
- /** @var \ArrayAccess<non-empty-string, Event\Asset> $assets */
+ /** @var \ArrayObject<non-empty-string, Event\Asset> $assets */
  $assets = new \ArrayObject();
 
  return new Event(

src/Sender/Frontend/Mapper/Smtp.php

@@ -51,11 +51,11 @@ private static function assetLink(string $uuid, Event\Asset $asset): string
  }
 
  /**
- * @return \ArrayAccess<non-empty-string, Event\Asset>
+ * @return \ArrayObject<non-empty-string, Event\Asset>
  */
- private static function fetchAssets(SmtpMessage $message): \ArrayAccess
+ private static function fetchAssets(SmtpMessage $message): \ArrayObject
  {
- /** @var \ArrayAccess<non-empty-string, Event\Asset> $assets */
+ /** @var \ArrayObject<non-empty-string, Event\Asset> $assets */
  $assets = new \ArrayObject();
 
  foreach ($message->getAttachments() as $attachment) {
@@ -83,9 +83,9 @@ private static function asset(File $attachment): Event\Asset
 
  /**
  * @param non-empty-string $uuid
- * @param \ArrayAccess<non-empty-string, Event\Asset> $assets
+ * @param \ArrayAccess<non-empty-string, Event\Asset>&\Traversable<non-empty-string, Event\Asset> $assets
  */
- private static function html(string $uuid, SmtpMessage $message, \ArrayAccess $assets): string
+ private static function html(string $uuid, SmtpMessage $message, \ArrayAccess&\Traversable $assets): string
  {
  $result = $message->getMessage(MessageFormat::Html)?->getValue() ?? '';
 

src/Sender/Frontend/Service.php

@@ -76,7 +76,7 @@ public function smtpAttachments(string $uuid): Attachments|Success
  }
 
  $attaches = [];
- foreach ($event->assets as $attachment) {
+ foreach ($event->assets ?? [] as $attachment) {
  $attachment instanceof AttachedFile and $attaches[] = $attachment;
  }
 

src/Support/Measure.php

@@ -11,15 +11,11 @@
 final class Measure
 {
  /**
- * @param int<0, max>|null $size
- * @return non-empty-string|null
+ * @param int<0, max> $size
+ * @return non-empty-string
  */
- public static function memory(?int $size): ?string
+ public static function memory(int $size): string
  {
- if ($size === null) {
- return null;
- }
-
  $units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB'];
  $power = (int) \floor(\log($size, 1024));
  $float = $power > 0 ? \round($size / (1024 ** $power), 2) : $size;

src/Support/Stream/Base64DecodeFilter.php

@@ -5,8 +5,11 @@
 namespace Buggregator\Trap\Support\Stream;
 
 /**
+ * @psalm-suppress all
+ *
  * @internal
  * @psalm-internal Buggregator\Trap
+ *
  * @link https://www.php.net/manual/function.stream-filter-register.php
  */
 final class Base64DecodeFilter extends \php_user_filter
@@ -15,12 +18,18 @@ final class Base64DecodeFilter extends \php_user_filter
 
  private string $buffer = '';
 
+ /**
+ * @param resource $in
+ * @param resource $out
+ * @param int<0, max> $consumed
+ */
  public function filter($in, $out, &$consumed, bool $closing): int
  {
  // Buffer size
  $bs = \strlen($this->buffer);
 
  while ($bucket = \stream_bucket_make_writeable($in)) {
+ /** @var int<1, max> $len */
  $len = $bs + $bucket->datalen;
  $d = $len % 4;
 
@@ -43,7 +52,7 @@ public function filter($in, $out, &$consumed, bool $closing): int
  }
 
  // Decode part of the data
- $bucket->data = \base64_decode($this->buffer . \substr($bucket->data, 0, -$d), true);
+ $bucket->data = \base64_decode($this->buffer . \substr($bucket->data, 0, -$d));
  $consumed += $bucket->datalen;
  $this->buffer = \substr($bucket->data, -$d);
 

src/Support/StreamHelper.php

@@ -131,21 +131,25 @@ public static function unzipBody(ServerRequestInterface $request): ServerRequest
  /**
  * @param array<non-empty-string|int, mixed> $readFilters filter name => filter options
  * @param array<non-empty-string|int, mixed> $writeFilters filter name => filter options
+ *
+ * @psalm-suppress UnusedFunctionCall
  */
  public static function createFileStream(array $readFilters = [], array $writeFilters = []): StreamInterface
  {
  $stream = \fopen('php://temp/maxmemory:' . self::MAX_FILE_MEMORY_SIZE, 'w+b');
 
+ /** @var mixed $options */
  foreach ($readFilters as $filter => $options) {
  \is_string($filter)
  ? \stream_filter_append($stream, $filter, \STREAM_FILTER_READ, $options)
- : \stream_filter_append($stream, $options, \STREAM_FILTER_READ);
+ : \stream_filter_append($stream, (string) $options, \STREAM_FILTER_READ);
  }
 
+ /** @var mixed $options */
  foreach ($writeFilters as $filter => $options) {
  \is_string($filter)
  ? \stream_filter_append($stream, $filter, \STREAM_FILTER_WRITE, $options)
- : \stream_filter_append($stream, $options, \STREAM_FILTER_WRITE);
+ : \stream_filter_append($stream, (string) $options, \STREAM_FILTER_WRITE);
  }
 
  return Stream::create($stream);

src/Traffic/Message/Multipart/File.php

@@ -115,7 +115,7 @@ public function getClientFilename(): ?string
 
  public function getClientMediaType(): ?string
  {
- return \explode(';', $this->getHeader('Content-Type')[0], 2)[0] ?? null;
+ return \explode(';', $this->getHeader('Content-Type')[0] ?? '', 2)[0] ?? null;
  }
 
  public function isEmbedded(): bool