Merge pull request #202 from ADmad/property-types

QA: Add type declarations and refine psalm types

Author: Xerkus

src/MessageTrait.php

@@ -30,16 +30,14 @@ trait MessageTrait
     /**
      * List of all registered headers, as key => array of values.
      *
-     * @var array
-     * @psalm-var array<non-empty-string, list<string>>
+     * @var array<non-empty-string, list<string>>
      */
     protected $headers = [];
 
     /**
      * Map of normalized header name to original name used to register header.
      *
-     * @var array
-     * @psalm-var array<non-empty-string, non-empty-string>
+     * @var array<non-empty-string, non-empty-string>
      */
     protected $headerNames = [];
 

src/Request/ArraySerializer.php

@@ -70,10 +70,9 @@ public static function fromArray(array $serializedRequest): Request
     }
 
     /**
-     * @return mixed
      * @throws Exception\DeserializationException
      */
-    private static function getValueFromKey(array $data, string $key, ?string $message = null)
+    private static function getValueFromKey(array $data, string $key, ?string $message = null): mixed
     {
         if (isset($data[$key])) {
             return $data[$key];

src/Response/ArraySerializer.php

@@ -68,10 +68,9 @@ public static function fromArray(array $serializedResponse): Response
     }
 
     /**
-     * @return mixed
      * @throws Exception\DeserializationException
      */
-    private static function getValueFromKey(array $data, string $key, ?string $message = null)
+    private static function getValueFromKey(array $data, string $key, ?string $message = null): mixed
     {
         if (isset($data[$key])) {
             return $data[$key];

src/Response/JsonResponse.php

@@ -43,8 +43,7 @@ class JsonResponse extends Response
         | JSON_HEX_QUOT
         | JSON_UNESCAPED_SLASHES;
 
-    /** @var mixed */
-    private $payload;
+    private mixed $payload;
 
     /**
      * Create a JSON response with the given data.

src/Uri.php

@@ -55,7 +55,11 @@ class Uri implements UriInterface, Stringable
      */
     public const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~\pL';
 
-    /** @var int[] Array indexed by valid scheme names to their corresponding ports. */
+    /**
+     * Array indexed by valid scheme names to their corresponding ports.
+     *
+     * @var array<string, positive-int>
+     */
     protected $allowedSchemes = [
         'http'  => 80,
         'https' => 443,