Fix psalm issues

psalm.xml

@@ -15,6 +15,7 @@
  <directory name="src"/>
  <ignoreFiles>
  <directory name="vendor"/>
+ <directory name="src/Test"/>
  </ignoreFiles>
  </projectFiles>
 </psalm>

src/Handler/Http/Handler/Websocket.php

@@ -66,7 +66,7 @@ public function handle(StreamClient $streamClient, ServerRequestInterface $reque
  }
 
  /**
- * Todo: extract to a separate Websocket service
+ * Todo: extract to a separated Websocket service
  *
  * @return iterable<array-key, Frame>
  */

src/Handler/Pipeline.php

@@ -29,7 +29,7 @@ final class Pipeline
  /**
  * @param iterable<TMiddleware> $middlewares
  * @param non-empty-string $method
- * @param Closure(): TReturn $last
+ * @param Closure(mixed...): TReturn $last
  * @param class-string<TReturn>|string $returnType
  */
  private function __construct(

src/Proto/Frame/Http.php

@@ -50,7 +50,7 @@ public static function fromString(string $payload, DateTimeImmutable $time): sta
  $request = new ServerRequest(
  $payload['method'] ?? 'GET',
  $payload['uri'] ?? '/',
- (array)$payload['headers'] ?? [],
+ (array)($payload['headers'] ?? []),
  $payload['body'] ?? '',
  $payload['protocolVersion'] ?? '1.1',
  $payload['serverParams'] ?? [],

src/Proto/Frame/Sentry/SentryStore.php

@@ -39,7 +39,7 @@ final class SentryStore extends Frame\Sentry
  * filename: non-empty-string,
  * lineno: positive-int,
  * abs_path: non-empty-string,
- * context_line: non-empty-string,
+ * context_line: non-empty-string
  * }
  * }
  * }>

src/Sender/Console/Renderer/Sentry/Exceptions.php

@@ -10,8 +10,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * @implements RendererInterface<Frame\Binary>
- *
  * @internal
  * @psalm-internal Buggregator\Trap\Sender\Console\Renderer
  */

src/Sender/Console/Renderer/Sentry/Header.php

@@ -11,8 +11,6 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * @implements RendererInterface<Frame\Binary>
- *
  * @internal
  */
 final class Header

src/Socket/Client.php

@@ -71,14 +71,17 @@ public function process(): void
  throw new \RuntimeException('Socket select failed.');
  }
 
+ /** @psalm-suppress RedundantCondition */
  if ($read !== []) {
  $this->readMessage();
  }
 
+ /** @psalm-suppress RedundantCondition */
  if ($write !== [] && $this->writeQueue !== []) {
  $this->writeQueue();
  }
 
+ /** @psalm-suppress RedundantCondition */
  if ($except !== [] || \socket_last_error($this->socket) !== 0) {
  throw new \RuntimeException('Socket exception.');
  }
@@ -150,14 +153,13 @@ private function readMessage(): void
 
  /**
  * @param positive-int $length
- *
- * @return non-empty-string
  */
  private function readBytes(int $length, bool $canBeLess = false): string
  {
  while (($left = $length - \strlen($this->readBuffer)) > 0) {
  $data = '';
  $read = @\socket_recv($this->socket, $data, $left, 0);
+ /** @psalm-suppress TypeDoesNotContainNull */
  if ($read === false || $data === null) {
  if ($this->readBuffer !== '') {
  $result = $this->readBuffer;

src/Traffic/Message/Headers.php

@@ -129,7 +129,7 @@ private function setHeaders(array $headers): void
  */
  private function validateAndTrimHeader(string $header, $values): array
  {
- if (!\is_string($header) || 1 !== \preg_match("@^[!#$%&'*+.^_`|~0-9A-Za-z-]+$@D", $header)) {
+ if (1 !== \preg_match("@^[!#$%&'*+.^_`|~0-9A-Za-z-]+$@D", $header)) {
  throw new \InvalidArgumentException('Header name must be an RFC 7230 compatible string');
  }
 

src/Traffic/StreamClient.php

@@ -11,7 +11,7 @@
 /**
  * Simple abstraction over a client two-way stream.
  * @internal
- * @psalm-internal Buggregator\Trap\Traffic
+ * @psalm-internal Buggregator\Trap
  * @extends \IteratorAggregate<int, string>
  */
 interface StreamClient extends \IteratorAggregate

src/functions.php

@@ -57,6 +57,7 @@ function trap(mixed ...$values): void
 
  // Dump sequence of values
  foreach ($values as $key => $value) {
+ /** @psalm-suppress TooManyArguments */
  VarDumper::dump($value, $key);
  }
  }