Chore: Bump PHPStan to level 7

phpstan.neon

@@ -1,7 +1,7 @@
 parameters:
     scanDirectories:
         - vendor/swoole/ide-helper
-    level: 5
+    level: 7
     paths:
         - src
         - tests

src/Http/Adapter.php

@@ -6,8 +6,8 @@
 
 abstract class Adapter
 {
-    abstract public function onStart(callable $callback);
-    abstract public function onRequest(callable $callback);
-    abstract public function start();
+    abstract public function onStart(callable $callback): void;
+    abstract public function onRequest(callable $callback): void;
+    abstract public function start(): void;
     abstract public function getContainer(): Container;
 }

src/Http/Adapter/FPM/Request.php

@@ -189,7 +189,7 @@ public function setURI(string $uri): static
      * Method for querying upload files data. If $key is not found empty array will be returned.
      *
      * @param  string  $key
-     * @return array
+     * @return array<string, mixed>
      */
     public function getFiles(string $key): array
     {
@@ -275,7 +275,13 @@ public function getHeader(string $key, string $default = ''): string
     {
         $headers = $this->generateHeaders();
 
-        return (isset($headers[$key])) ? $headers[$key] : $default;
+        if (!isset($headers[$key])) {
+            return $default;
+        }
+
+        $value = $headers[$key];
+
+        return \is_array($value) ? \implode(', ', $value) : $value;
     }
 
     /**
@@ -316,7 +322,7 @@ public function removeHeader(string $key): static
      *
      * Generate PHP input stream and parse it as an array in order to handle different content type of requests
      *
-     * @return array
+     * @return array<string, mixed>
      */
     protected function generateInput(): array
     {
@@ -331,7 +337,7 @@ protected function generateInput(): array
             $length = (empty($length)) ? \strlen($contentType) : $length;
             $contentType = \substr($contentType, 0, $length);
 
-            $this->rawPayload = \file_get_contents('php://input');
+            $this->rawPayload = \file_get_contents('php://input') ?: '';
 
             switch ($contentType) {
                 case 'application/json':
@@ -361,7 +367,7 @@ protected function generateInput(): array
      *
      * Parse request headers as an array for easy querying using the getHeader method
      *
-     * @return array
+     * @return array<string, string|array<int, string>>
      */
     protected function generateHeaders(): array
     {

src/Http/Adapter/FPM/Response.php

@@ -74,7 +74,7 @@ public function sendHeader(string $key, mixed $value): void
      *
      * @param  string  $name
      * @param  string  $value
-     * @param  array  $options
+     * @param  array<string, mixed>  $options
      * @return void
      */
     protected function sendCookie(string $name, string $value, array $options): void

src/Http/Adapter/FPM/Server.php

@@ -9,7 +9,7 @@ class Server extends Adapter
 {
     public function __construct(private Container $container) {}
 
-    public function onRequest(callable $callback)
+    public function onRequest(callable $callback): void
     {
         $request = new Request();
         $response = new Response();
@@ -20,7 +20,7 @@ public function onRequest(callable $callback)
         \call_user_func($callback, $request, $response);
     }
 
-    public function onStart(callable $callback)
+    public function onStart(callable $callback): void
     {
         \call_user_func($callback, $this);
     }
@@ -30,7 +30,7 @@ public function getContainer(): Container
         return $this->container;
     }
 
-    public function start()
+    public function start(): void
     {
         return;
     }

src/Http/Adapter/Swoole/Request.php

@@ -31,7 +31,7 @@ public function __construct(SwooleRequest $request)
      */
     public function getRawPayload(): string
     {
-        return $this->swoole->rawContent();
+        return $this->swoole->rawContent() ?: '';
     }
 
     /**

src/Http/Adapter/Swoole/Server.php

@@ -15,14 +15,17 @@ class Server extends Adapter
     protected const REQUEST_CONTAINER_CONTEXT_KEY = '__utopia_http_request_container';
     protected Container $container;
 
+    /**
+     * @param  array<string, mixed>  $settings
+     */
     public function __construct(string $host, ?string $port = null, array $settings = [], int $mode = SWOOLE_PROCESS, ?Container $container = null)
     {
         $this->server = new SwooleServer($host, (int) $port, $mode);
         $this->server->set($settings);
         $this->container = $container ?? new Container();
     }
 
-    public function onRequest(callable $callback)
+    public function onRequest(callable $callback): void
     {
         $this->server->on('request', function (SwooleRequest $request, SwooleResponse $response) use ($callback) {
             $requestContainer = new Container($this->container);
@@ -49,7 +52,7 @@ public function getServer(): SwooleServer
         return $this->server;
     }
 
-    public function onStart(callable $callback)
+    public function onStart(callable $callback): void
     {
         $this->server->on('start', function () use ($callback) {
             go(function () use ($callback) {
@@ -58,8 +61,8 @@ public function onStart(callable $callback)
         });
     }
 
-    public function start()
+    public function start(): void
     {
-        return $this->server->start();
+        $this->server->start();
     }
 }

src/Http/Adapter/SwooleCoroutine/Server.php

@@ -19,6 +19,9 @@ class Server extends Adapter
     /** @var callable|null */
     protected $onStartCallback = null;
 
+    /**
+     * @param  array<string, mixed>  $settings
+     */
     public function __construct(
         string $host,
         ?string $port = null,
@@ -30,7 +33,7 @@ public function __construct(
         $this->container = $container ?? new Container();
     }
 
-    public function onRequest(callable $callback)
+    public function onRequest(callable $callback): void
     {
         $this->server->handle('/', function (SwooleRequest $request, SwooleResponse $response) use ($callback) {
             $requestContainer = new Container($this->container);
@@ -57,12 +60,12 @@ public function getServer(): SwooleServer
         return $this->server;
     }
 
-    public function onStart(callable $callback)
+    public function onStart(callable $callback): void
     {
         $this->onStartCallback = $callback;
     }
 
-    public function start()
+    public function start(): void
     {
         if ($this->onStartCallback) {
             \call_user_func($this->onStartCallback, $this);

src/Http/Files.php

@@ -95,6 +95,10 @@ public function load(string $directory, ?string $root = null): void
 
         $handle = opendir(strval($directory));
 
+        if ($handle === false) {
+            throw new Exception("Failed to open directory: {$directory}");
+        }
+
         while ($path = readdir($handle)) {
             $extension = pathinfo($path, PATHINFO_EXTENSION);
 

src/Http/Http.php

@@ -464,7 +464,7 @@ public function getResources(array $list): array
     /**
      * Set a resource on the given scope.
      *
-     * @param string[] $injections
+     * @param list<string> $injections
      */
     public function setResource(string $name, callable $callback, array $injections = []): void
     {
@@ -474,7 +474,7 @@ public function setResource(string $name, callable $callback, array $injections
     /**
      * Set a request-scoped resource on the current request's container.
      *
-     * @param string[] $injections
+     * @param list<string> $injections
      */
     protected function setRequestResource(string $name, callable $callback, array $injections = []): void
     {
@@ -516,7 +516,7 @@ public static function isStage(): bool
      *
      * Get all application routes
      *
-     * @return array
+     * @return array<string, Route[]>
      */
     public static function getRoutes(): array
     {
@@ -628,7 +628,7 @@ public static function onRequest(): Hook
         return $hook;
     }
 
-    public function start()
+    public function start(): void
     {
 
         $this->server->onRequest(
@@ -779,9 +779,9 @@ public function execute(Route $route, Request $request, Response $response): sta
      * Get Arguments
      *
      * @param  Hook  $hook
-     * @param  array  $values
-     * @param  array  $requestParams
-     * @return array
+     * @param  array<string, mixed>  $values
+     * @param  array<string, mixed>  $requestParams
+     * @return array<int, mixed>
      *
      * @throws Exception
      */
@@ -1002,7 +1002,7 @@ private function runInternal(Request $request, Response $response): static
      * Creates an validator instance and validate given value with given rules.
      *
      * @param  string  $key
-     * @param  array  $param
+     * @param  array<string, mixed>  $param
      * @param  mixed  $value
      * @return void
      *

src/Http/Request.php

@@ -28,24 +28,27 @@ abstract class Request
     /**
      * Container for php://input parsed stream as an associative array
      *
-     * @var array|null
+     * @var array<string, mixed>|null
      */
     protected $payload = null;
 
     /**
      * Container for parsed query string params
      *
-     * @var array|null
+     * @var array<string, mixed>|null
      */
     protected $queryString = null;
 
     /**
      * Container for parsed headers
      *
-     * @var array|null
+     * @var array<string, string|array<int, string>>|null
      */
     protected $headers = null;
 
+    /**
+     * @var array<int, string>
+     */
     protected array $trustedIpHeaders = [];
 
     /**
@@ -69,7 +72,7 @@ public function getParam(string $key, mixed $default = null): mixed
      *
      * Get all params of current method
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getParams(): array
     {
@@ -145,7 +148,7 @@ abstract public function setServer(string $key, string $value): static;
      * Set which headers to trust for determining client IP address.
      * Headers are checked in order; the first one found with a valid IP is used.
      *
-     * @param  array  $headers
+     * @param  array<int, string>  $headers
      * @return static
      */
     public function setTrustedIpHeaders(array $headers): static
@@ -244,7 +247,7 @@ abstract public function setURI(string $uri): static;
      * Method for querying upload files data. If $key is not found empty array will be returned.
      *
      * @param  string  $key
-     * @return array
+     * @return array<string, mixed>
      */
     abstract public function getFiles(string $key): array;
 
@@ -361,7 +364,7 @@ public function getSize(): int
                 $headerStrings[] = $key . ': ' . $value;
             }
         }
-        return \mb_strlen(\implode("\n", $headerStrings), '8bit') + \mb_strlen(\file_get_contents('php://input'), '8bit');
+        return \mb_strlen(\implode("\n", $headerStrings), '8bit') + \mb_strlen(\file_get_contents('php://input') ?: '', '8bit');
     }
 
     /**
@@ -486,7 +489,7 @@ public function getRangeUnit(): ?string
     /**
      * Set query string parameters
      *
-     * @param  array  $params
+     * @param  array<string, mixed>  $params
      * @return static
      */
     public function setQueryString(array $params): static
@@ -499,7 +502,7 @@ public function setQueryString(array $params): static
     /**
      * Set payload parameters
      *
-     * @param  array  $params
+     * @param  array<string, mixed>  $params
      * @return static
      */
     public function setPayload(array $params): static
@@ -514,7 +517,7 @@ public function setPayload(array $params): static
      *
      * Parse request headers as an array for easy querying using the getHeader method
      *
-     * @return array
+     * @return array<string, string|array<int, string>>
      */
     protected function generateHeaders(): array
     {
@@ -548,7 +551,7 @@ protected function generateHeaders(): array
      *
      * Generate PHP input stream and parse it as an array in order to handle different content type of requests
      *
-     * @return array
+     * @return array<string, mixed>
      */
     abstract protected function generateInput(): array;
 
@@ -557,7 +560,7 @@ abstract protected function generateInput(): array;
      *
      * Parse content-range request header for easy access
      *
-     * @return array|null
+     * @return array{unit: string, size: int, start: int, end: int}|null
      */
     protected function parseContentRange(): ?array
     {
@@ -611,7 +614,7 @@ protected function parseContentRange(): ?array
      *
      * Parse range request header for easy access
      *
-     * @return array|null
+     * @return array<string, mixed>|null
      */
     protected function parseRange(): ?array
     {