Update to PHPStan 2.x

Fix issues found:
- Define the type of the bodyParsers array.
- Type hint the input to a body parser to string as that's what it
  always is.
- ServerRequest::getQueryParams() always returns an array, so we don't
  need to test for it.
- Ensure that the uri key in the file metadata is a string before using
  it.

Remove tests for string and use a type hint

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|null> */
     protected array $bodyParsers;
 
     /**
@@ -49,7 +50,7 @@ final public function __construct(ServerRequestInterface $serverRequest)
     {
         $this->serverRequest = $serverRequest;
 
-        $this->registerMediaTypeParser('application/json', function ($input) {
+        $this->registerMediaTypeParser('application/json', function (string $input) {
             $result = json_decode($input, true);
 
             if (!is_array($result)) {
@@ -59,7 +60,7 @@ final public function __construct(ServerRequestInterface $serverRequest)
             return $result;
         });
 
-        $xmlParserCallable = function ($input) {
+        $xmlParserCallable = function (string $input) {
             $backup = self::disableXmlEntityLoader(true);
             $backup_errors = libxml_use_internal_errors(true);
             $result = simplexml_load_string($input);
@@ -79,6 +80,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 +218,7 @@ public function getQueryParams(): array
     {
         $queryParams = $this->serverRequest->getQueryParams();
 
-        if (is_array($queryParams) && !empty($queryParams)) {
+        if (!empty($queryParams)) {
             return $queryParams;
         }
 

tests/ServerRequestTest.php

@@ -741,6 +741,25 @@ public function testGetParsedBodyJson()
         }
     }
 
+    public function testGetParsedBodyJsonWithInvalidStream()
+    {
+        foreach ($this->factoryProviders as $factoryProvider) {
+            /** @var Psr17FactoryProvider $provider */
+            $provider = new $factoryProvider();
+            $decoratedServerRequestFactory = new DecoratedServerRequestFactory($provider->getServerRequestFactory());
+
+            $streamFactory = $provider->getStreamFactory();
+            $stream = $streamFactory->createStream(0);
+
+            $request = $decoratedServerRequestFactory->createServerRequest('POST', 'https://google.com');
+            $request = $request
+                ->withHeader('Content-Type', 'application/json;charset=utf8')
+                ->withBody($stream);
+
+            $this->assertEquals(['foo' => 'bar'], $request->getParsedBody());
+        }
+    }
+
     public function testGetParsedBodyInvalidJson()
     {
         foreach ($this->factoryProviders as $factoryProvider) {