Fix psalm, clear psalm-baseline.yaml

psalm.xml

@@ -11,6 +11,12 @@
     <issueHandlers>
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
         <RedundantCastGivenDocblockType errorLevel="suppress"/>
+        <MixedAssignment errorLevel="suppress"/>
+        <MixedArrayOffset errorLevel="suppress"/>
+        <MixedArgument errorLevel="suppress"/>
+        <MixedMethodCall errorLevel="suppress"/>
+        <MixedPropertyTypeCoercion errorLevel="suppress"/>
+        <MixedArrayAccess errorLevel="suppress"/>
     </issueHandlers>
     <projectFiles>
         <directory name="src"/>

src/Sender/Console/Renderer/Smtp.php

@@ -58,9 +58,9 @@ public function render(OutputInterface $output, Frame $frame): void
             foreach ($message->getAttachments() as $attach) {
                 Files::renderFile(
                     $output,
-                    $attach->getClientFilename(),
+                    $attach->getClientFilename() ?? 'undefined',
                     $attach->getSize(),
-                    $attach->getClientMediaType(),
+                    $attach->getClientMediaType() ?? 'undefined',
                 );
             }
             $output->writeln('');

src/Sender/Console/Renderer/TemplateRenderer.php

@@ -20,6 +20,7 @@ public function __construct(
 
     public function render(string $template, array $data = []): void
     {
+        /** @psalm-suppress InternalMethod */
         $this->renderer->render(
             $this->templateEngine->render($template, $data),
             0

src/Sender/Console/Renderer/VarDumper.php

@@ -94,7 +94,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in
                         empty($request['method'] ?? '') or $meta['Method'] = $request['method'];
                         empty($request['uri'] ?? '') or $meta['URI'] = $request['uri'];
                         if ($controller = $request['controller']) {
-                            $meta['Controller'] = rtrim($this->dumper->dump($controller, true), "\n");
+                            $meta['Controller'] = rtrim((string) $this->dumper->dump($controller, true), "\n");
                         }
                     } elseif (isset($context['cli'])) {
                         $meta['Command'] = $context['cli']['command_line'];
@@ -107,7 +107,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in
                 Common::renderMetadata($output, $meta);
                 $output->writeln('');
 
-                $output->write($this->dumper->dump($data, true), true, OutputInterface::OUTPUT_RAW);
+                $output->write((string) $this->dumper->dump($data, true), true, OutputInterface::OUTPUT_RAW);
             }
         };
     }

src/Sender/Console/Support/Common.php

@@ -26,12 +26,12 @@ public static function renderHeader1(OutputInterface $output, string $title, ?st
         $output->writeln(['', \implode('', $parts), '']);
     }
 
-    public static function renderHeader2(OutputInterface $output, string $title, string ...$sub): void
+    public static function renderHeader2(OutputInterface $output, string $title, ?string ...$sub): void
     {
         $parts = ["<fg=white;options=bold># $title </>"];
         foreach ($sub as $color => $value) {
             $color = \is_string($color) ? $color : 'gray';
-            $parts[] = \sprintf('<fg=%s> %s </>', $color, $value);
+            $parts[] = \sprintf('<fg=%s> %s </>', $color, $value ?? 'NULL');
         }
 
         $output->writeln(['', \implode('', $parts), '']);
@@ -53,13 +53,13 @@ public static function renderHighlightedLine(OutputInterface $output, string $li
     }
 
     /**
-     * @param array<array-key, mixed> $data
+     * @param array<string, mixed> $data
      */
     public static function renderMetadata(OutputInterface $output, array $data): void
     {
+        /** @psalm-suppress ArgumentTypeCoercion */
         $maxHeaderLength = \max(\array_map('strlen', \array_keys($data)));
 
-        /** @var mixed $value */
         foreach ($data as $head => $value) {
             // Align headers to the right
             self::renderHeader(

src/Sender/Console/Support/Files.php

@@ -13,6 +13,9 @@
 final class Files
 {
     /**
+     *
+     * @param non-negative-int|null $size
+     *
      * Render file info. Example:
      *  ┌───┐  logo.ico
      *  │ico│  20.06 KiB
@@ -24,6 +27,7 @@ final class Files
      *  │   │  any value                <= positional argument
      *  │ico│  unknown size
      *  └───┘  image/x-icon
+     *
      */
     public static function renderFile(
         OutputInterface $output,
@@ -33,7 +37,7 @@ public static function renderFile(
         string ...$additional
     ): void {
         // File extension
-        $ex = \substr($fileName, \strrpos($fileName, '.') + 1);
+        $ex = \substr($fileName, (int) \strrpos($fileName, '.') + 1);
         $ex = \strlen($ex) > 3 ? '   ' :  \str_pad($ex, 3, ' ', \STR_PAD_BOTH);
 
         // File size

src/Sender/Console/Support/Tables.php

@@ -23,7 +23,7 @@ public static function renderKeyValueTable(OutputInterface $output, string $titl
             return;
         }
 
-        $keyLength = \max(\array_map(static fn($key) => \strlen($key), \array_keys($data)));
+        $keyLength = \max(\array_map(static fn($key) => \strlen((string) $key), \array_keys($data)));
         $valueLength = \max(1, (new Terminal())->getWidth() - 7 - $keyLength);
 
         $table->setRows([...(static function (array $data) use ($valueLength): iterable {

src/Sender/ConsoleSender.php

@@ -21,8 +21,10 @@ final class ConsoleSender implements Sender
 {
     public static function create(OutputInterface $output): self
     {
+        /** @psalm-suppress InternalMethod, InternalClass */
         Termwind::renderUsing($output);
 
+        /** @psalm-suppress InternalClass */
         $templateRenderer = new TemplateRenderer(
             new HtmlRenderer(),
             new TemplateEngine(Info::TRAP_ROOT . '/resources/templates')

src/Socket/Client.php

@@ -26,6 +26,9 @@ final class Client implements Destroyable
     private \Closure $onPayload;
     private \Closure $onClose;
 
+    /**
+     * @param positive-int $payloadSize
+     */
     private function __construct(
         private readonly \Socket $socket,
         private readonly int $payloadSize,
@@ -117,6 +120,7 @@ protected function onInit(): void
      */
     public function setOnPayload(callable $callable): void
     {
+        /** @psalm-suppress PossiblyNullPropertyAssignmentValue */
         $this->onPayload = \Closure::bind($callable(...), $this);
     }
 
@@ -126,6 +130,7 @@ public function setOnPayload(callable $callable): void
      */
     public function setOnClose(callable $callable): void
     {
+        /** @psalm-suppress PossiblyNullPropertyAssignmentValue */
         $this->onClose = \Closure::bind($callable(...), $this);
     }
 

src/Socket/Server.php

@@ -92,6 +92,7 @@ public static function init(
 
     public function process(): void
     {
+        /** @psalm-suppress PossiblyInvalidArgument */
         while (!$this->cancelled and false !== ($socket = \socket_accept($this->socket))) {
             $client = null;
             try {

src/Support/StreamHelper.php

@@ -67,7 +67,7 @@ public static function strpos(StreamInterface $stream, string $substr): int|fals
      *
      * @param non-empty-string $boundary
      *
-     * @return int Bytes written
+     * @return non-negative-int Bytes written
      */
     public static function writeStreamUntil(StreamInterface $from, StreamInterface $to, string $boundary): int
     {

src/Traffic/Dispatcher/Http.php

@@ -47,6 +47,7 @@ public function __construct(
         $handlers[] = new Fallback($middlewares);
 
         // Build pipeline of handlers.
+        /** @psalm-suppress MixedPropertyTypeCoercion */
         $this->pipeline = Pipeline::build(
             $handlers,
             /** @see RequestHandler::handle() */

src/Traffic/Dispatcher/Smtp.php

@@ -31,7 +31,6 @@ public function __construct(
     public function dispatch(StreamClient $stream): iterable
     {
         $stream->sendData($this->createResponse(self::READY, 'mailamie'));
-
         $protocol = [];
 
         $message = null;
@@ -40,9 +39,11 @@ public function dispatch(StreamClient $stream): iterable
             if (\preg_match('/^(?:EHLO|HELO)/', $response)) {
                 $stream->sendData($this->createResponse(self::OK));
             } elseif (\preg_match('/^MAIL FROM:\s*<(.*)>/', $response, $matches)) {
+                /** @var array{1: non-empty-string} $matches */
                 $protocol['FROM'][] = $matches[1];
                 $stream->sendData($this->createResponse(self::OK));
             } elseif (\preg_match('/^RCPT TO:\s*<(.*)>/', $response, $matches)) {
+                /** @var array{1: non-empty-string} $matches */
                 $protocol['BCC'][] = $matches[1];
                 $stream->sendData($this->createResponse(self::OK));
             } elseif (\str_starts_with($response, 'QUIT')) {

src/Traffic/Message/Headers.php

@@ -9,12 +9,15 @@
  */
 trait Headers
 {
-    /** @var array Map of all registered headers, as original name => array of values */
+    /** @var array<non-empty-string, list<string>> Map of all registered headers, as original name => array of values */
     private array $headers = [];
 
-    /** @var array Map of lowercase header name => original name at registration */
+    /** @var array<non-empty-string, non-empty-string> Map of lowercase header name => original name at registration */
     private array $headerNames = [];
 
+    /**
+     * @return array<non-empty-string, list<string>>
+     */
     public function getHeaders(): array
     {
         return $this->headers;
@@ -26,7 +29,7 @@ public function hasHeader(string $header): bool
     }
 
     /**
-     * @return string[]
+     * @return list<string>
      */
     public function getHeader(string $header): array
     {
@@ -45,9 +48,10 @@ public function getHeaderLine(string $header): string
         return \implode(', ', $this->getHeader($header));
     }
 
-    public function withHeader(string $header, $value): static
+    public function withHeader(string $header, mixed $value): static
     {
         $value = $this->validateAndTrimHeader($header, $value);
+        /** @var non-empty-string $normalized */
         $normalized = \strtr($header, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
 
         $new = clone $this;
@@ -87,7 +91,7 @@ public function withoutHeader(string $header): static
     }
 
     /**
-     * @param array<array-key, scalar|list<scalar>> $headers
+     * @param array<string|int, scalar|list<scalar>> $headers
      */
     private function setHeaders(array $headers): void
     {
@@ -98,6 +102,7 @@ private function setHeaders(array $headers): void
                 $header = (string)$header;
             }
             $value = $this->validateAndTrimHeader($header, $value);
+            /** @var non-empty-string $normalized */
             $normalized = \strtr($header, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
             if (isset($this->headerNames[$normalized])) {
                 $header = $this->headerNames[$normalized];
@@ -126,8 +131,12 @@ private function setHeaders(array $headers): void
      * field-value  = *( ( %x21-7E / %x80-FF ) [ 1*( SP / HTAB ) ( %x21-7E / %x80-FF ) ] )
      *
      * @see https://tools.ietf.org/html/rfc7230#section-3.2.4
+     *
+     * @psalm-assert non-empty-string $header
+     *
+     * @return non-empty-list<string>
      */
-    private function validateAndTrimHeader(string $header, $values): array
+    private function validateAndTrimHeader(string $header, mixed $values): array
     {
         if (1 !== \preg_match("@^[!#$%&'*+.^_`|~0-9A-Za-z-]+$@D", $header)) {
             throw new \InvalidArgumentException('Header name must be an RFC 7230 compatible string');
@@ -170,10 +179,10 @@ private function validateAndTrimHeader(string $header, $values): array
     /**
      * List of header values.
      *
-     * @param array<string, list<non-empty-string>> $headers
+     * @param array<non-empty-string, list<string>> $headers
      * @param non-empty-string $header
      *
-     * @return list<non-empty-string>
+     * @return list<string>
      */
     private static function findHeader(array $headers, string $header): array
     {

src/Traffic/Message/Multipart/Field.php

@@ -6,7 +6,7 @@
 
 /**
  * @psalm-type FieldDataArray = array{
- *     headers: array<string, non-empty-list<string>>,
+ *     headers: array<non-empty-string, list<string>>,
  *     name?: string,
  *     value: string
  * }
@@ -15,6 +15,9 @@
  */
 final class Field extends Part
 {
+    /**
+     * @param array<non-empty-string, list<string>> $headers
+     */
     public function __construct(array $headers, ?string $name = null, private string $value = '')
     {
         parent::__construct($headers, $name);
@@ -30,6 +33,7 @@ public static function fromArray(array $data): self
 
     /**
      * @return FieldDataArray
+     * @psalm-suppress ImplementedReturnTypeMismatch
      */
     public function jsonSerialize(): array
     {

src/Traffic/Message/Multipart/File.php

@@ -10,19 +10,23 @@
 
 /**
  * @psalm-type FileDataArray = array{
- *     headers: array<string, non-empty-list<string>>,
+ *     headers: array<non-empty-string, list<string>>,
  *     name?: string,
- *     fileName: string,
- *     size?: int
+ *     fileName?: string,
+ *     size?: non-negative-int
  * }
  *
  * @internal
  */
 final class File extends Part implements UploadedFileInterface
 {
     private ?UploadedFileInterface $uploadedFile = null;
+    /** @var non-negative-int|null  */
     private ?int $fileSize = null;
 
+    /**
+     * @param array<non-empty-string, list<string>> $headers
+     */
     public function __construct(array $headers, ?string $name = null, private ?string $fileName = null)
     {
         parent::__construct($headers, $name);
@@ -33,24 +37,35 @@ public function __construct(array $headers, ?string $name = null, private ?strin
      */
     public static function fromArray(array $data): self
     {
-        $self = new self($data['headers'], $data['name'] ?? null, $data['fileName']);
+        $self = new self($data['headers'], $data['name'] ?? null, $data['fileName'] ?? null);
         $self->fileSize = $data['size'] ?? null;
         return $self;
     }
 
     /**
      * @return FileDataArray
+     *
+     * @psalm-suppress ImplementedReturnTypeMismatch
      */
     public function jsonSerialize(): array
     {
-        return parent::jsonSerialize() + [
-                'fileName' => $this->fileName,
-                'size' => $this->getSize(),
-            ];
+        $data = parent::jsonSerialize();
+        if ($this->fileName !== null) {
+            $data['fileName'] = $this->fileName;
+        }
+        if ($this->fileSize !== null) {
+            $data['size'] = $this->fileSize;
+        }
+
+        return $data;
     }
 
+    /**
+     * @param non-negative-int|null $size
+     */
     public function setStream(StreamInterface $stream, ?int $size = null, int $code = \UPLOAD_ERR_OK): void
     {
+        /** @psalm-suppress PropertyTypeCoercion */
         $this->fileSize = $size ?? $stream->getSize() ?? null;
         $this->uploadedFile = new UploadedFile(
             $stream,
@@ -83,6 +98,9 @@ public function moveTo(string $targetPath): void
         $this->getUploadedFile()->moveTo($targetPath);
     }
 
+    /**
+     * @return non-negative-int|null
+     */
     public function getSize(): ?int
     {
         return $this->fileSize;