Update to PHPStan 2.x

Fix issues found:
- If the input to a body parser callable isn't a string, then return
  null.
- If we fail to bind $this to a callable, then assign the callable.
- Ensure that the uri key from stream_get_meta_data() is a string.

Author: akrabat

composer.json

@@ -45,7 +45,7 @@
         "laminas/laminas-diactoros": "^3.1.0",
         "nyholm/psr7": "^1.8.1",
         "php-http/psr7-integration-tests": "^1.3.0",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^9.6",
         "doctrine/instantiator": "^1.3.1",
         "squizlabs/php_codesniffer": "^3.9"

phpstan.neon.dist

@@ -1,5 +1,7 @@
 parameters:
-  checkMissingIterableValueType: false
   level: max
   paths:
     - src
+  ignoreErrors:
+    -
+      identifier: missingType.iterableValue

src/Response.php

@@ -270,7 +270,7 @@ public function withFileDownload($file, ?string $name = null, $contentType = tru
                 ? $file->getMetadata()
                 : stream_get_meta_data($file);
 
-            if (is_array($metaData) && isset($metaData['uri'])) {
+            if (is_array($metaData) && isset($metaData['uri']) && is_string($metaData['uri'])) {
                 $uri = $metaData['uri'];
                 if ('php://' !== substr($uri, 0, 6)) {
                     $fileName = basename($uri);

src/ServerRequest.php

@@ -40,6 +40,7 @@ class ServerRequest implements ServerRequestInterface
 {
     protected ServerRequestInterface $serverRequest;
 
+    /** @var array<string, callable> */
     protected array $bodyParsers;
 
     /**
@@ -50,6 +51,9 @@ final public function __construct(ServerRequestInterface $serverRequest)
         $this->serverRequest = $serverRequest;
 
         $this->registerMediaTypeParser('application/json', function ($input) {
+            if (!is_string($input)) {
+                return null;
+            }
             $result = json_decode($input, true);
 
             if (!is_array($result)) {
@@ -60,6 +64,9 @@ final public function __construct(ServerRequestInterface $serverRequest)
         });
 
         $xmlParserCallable = function ($input) {
+            if (!is_string($input)) {
+                return null;
+            }
             $backup = self::disableXmlEntityLoader(true);
             $backup_errors = libxml_use_internal_errors(true);
             $result = simplexml_load_string($input);
@@ -79,6 +86,9 @@ final public function __construct(ServerRequestInterface $serverRequest)
         $this->registerMediaTypeParser('text/xml', $xmlParserCallable);
 
         $this->registerMediaTypeParser('application/x-www-form-urlencoded', function ($input) {
+            if (!is_string($input)) {
+                return null;
+            }
             parse_str($input, $data);
             return $data;
         });
@@ -214,7 +224,7 @@ public function getQueryParams(): array
     {
         $queryParams = $this->serverRequest->getQueryParams();
 
-        if (is_array($queryParams) && !empty($queryParams)) {
+        if (!empty($queryParams)) {
             return $queryParams;
         }
 
@@ -650,7 +660,7 @@ public function getServerParam(string $key, $default = null)
     public function registerMediaTypeParser(string $mediaType, callable $callable): ServerRequestInterface
     {
         if ($callable instanceof Closure) {
-            $callable = $callable->bindTo($this);
+            $callable = $callable->bindTo($this) ?? $callable;
         }
 
         $this->bodyParsers[$mediaType] = $callable;