Upgrade PHPStan to version 2

 - phpstan/phpstan updated from 1.12.21 to 2.1.8 major
   See changes: phpstan/phpstan@1.12.21...2.1.8
   Release notes: https://github.com/phpstan/phpstan/releases/tag/2.1.8

`list<T>` is now distinct from `T[]` aka `array<T>`.

Author: jtojnar

composer.json

@@ -12,7 +12,7 @@
         "friendsofphp/php-cs-fixer": "^3.0",
         "php-parallel-lint/php-parallel-lint": "^1.0",
         "symfony/phpunit-bridge": "^6.2 || ^7.0",
-        "phpstan/phpstan": "^1.12"
+        "phpstan/phpstan": "^2.1"
     },
     "autoload": {
         "psr-4": { "Fossar\\GuzzleTranscoder\\": "src/" }

src/GuzzleTranscoder.php

@@ -52,7 +52,7 @@ private function createTranscoder(): TranscoderInterface {
     public function convert(ResponseInterface $response): ResponseInterface {
         $stream = $response->getBody();
 
-        /** @var array<string, string[]> */
+        /** @var array<string, list<string>> */
         $headers = $response->getHeaders();
         $result = $this->convertResponse($headers, (string) $stream);
         if ($result !== null) {
@@ -77,6 +77,7 @@ public function convert(ResponseInterface $response): ResponseInterface {
      */
     public function __invoke(callable $handler): callable {
         return function(RequestInterface $request, array $options) use ($handler): PromiseInterface {
+            /** @var array<string, mixed> $options */
             $promise = $handler($request, $options);
 
             return $promise->then(fn(ResponseInterface $response): ResponseInterface => $this->convert($response));
@@ -94,9 +95,9 @@ public function __invoke(callable $handler): callable {
      *
      * Otherwise an array containing the new headers and content is returned.
      *
-     * @param array<string, string[]> $headers
+     * @param array<string, list<string>> $headers
      *
-     * @return ?array{headers: array<string, string[]>, content: string}
+     * @return ?array{headers: array<string, list<string>>, content: string}
      */
     public function convertResponse(array $headers, string $content): ?array {
         $headerDeclaredEncoding = null;

src/Utils.php

@@ -72,7 +72,7 @@ class Utils {
      *    [Basic=>null, realm=>'"foo\bar"']
      *    ["</TheBook/chapter,2>" => null, "rel" => "pre,vious", "title*" => "UTF-8'de'letztes%20Kapitel" ], ["</TheBook/chapter4>" => null, "rel" => "next", "title*" => "UTF-8'de'n%c3%a4chstes%20Kapitel" ]
      *
-     * @param string[]|string $headerValues
+     * @param list<string>|string $headerValues
      *
      * @throws \Exception
      *

tests/GuzzleTranscoderTest.php

@@ -214,7 +214,7 @@ public function testConvertResponse(): void {
      * Gets the headers from a HTTP response as one dimensional associative array
      * with header names as keys. The header values will not be parsed but saved as-is!
      *
-     * @return array{headers: array<string, string[]>, body: string}
+     * @return array{headers: array<string, list<string>>, body: string}
      */
     private function splitHeadersAndContentFromHttpResponseString(string $responseString): array {
         $lines = explode("\n", $responseString);

tests/ReadmeTest.php

@@ -36,8 +36,8 @@ public function readmeExamples(): iterable {
         foreach ($matches as $match) {
             $mockedSourceBody = file_get_contents(__DIR__ . '/resources/' . $match['response']);
             \assert($mockedSourceBody !== false); // For PHPStan.
+            /** @var array<string, string> $mockedHeaders */
             $mockedHeaders = json_decode($match['headers'], true);
-            \assert(\is_array($mockedHeaders)); // For PHPStan.
             $expectedBody = file_get_contents(__DIR__ . '/resources/' . $match['expected']);
             \assert($expectedBody !== false); // For PHPStan.