Some Psalm level 1

Author: BenMorel

src/Message.php

@@ -22,7 +22,7 @@ abstract class Message
      * The keys represent the lowercase header name, and
      * each value is an array of strings associated with the header.
      *
-     * @var array
+     * @var array<string, list<string>>
      */
     protected array $headers = [];
 
@@ -64,7 +64,7 @@ public function withProtocolVersion(string $version): Message
      * The keys represent the header name as it will be sent over the wire, and
      * each value is an array of strings associated with the header.
      *
-     * @return array
+     * @return array<string, list<string>>
      */
     public function getHeaders() : array
     {

src/Request.php

@@ -127,6 +127,8 @@ public static function getCurrent(bool $trustProxy = false, int $hostPortSource
     {
         $request = new Request();
 
+        /** @var array<string, string> $_SERVER */
+
         if (isset($_SERVER['HTTPS'])) {
             if ($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] === '1') {
                 $request->isSecure = true;
@@ -253,13 +255,14 @@ public static function getCurrent(bool $trustProxy = false, int $hostPortSource
      *   - keys are lowercased
      *   - values are arrays of strings
      *
-     * @return array
+     * @return array<string, list<string>>
      */
     private static function getCurrentRequestHeaders() : array
     {
         $headers = [];
 
         if (function_exists('apache_request_headers')) {
+            /** @var array<string, string> $requestHeaders */
             $requestHeaders = apache_request_headers();
 
             if ($requestHeaders) {
@@ -272,6 +275,8 @@ private static function getCurrentRequestHeaders() : array
             }
         }
 
+        /** @var array<string, string> $_SERVER */
+
         foreach ($_SERVER as $key => $value) {
             if (substr($key, 0, 5) === 'HTTP_') {
                 $key = substr($key, 5);
@@ -1175,6 +1180,7 @@ private function parseQualityValues(string $header) : array
     {
         $values = $this->parseHeaderParameters($header);
 
+        /** @psalm-var list<array{string, float, int}> $result */
         $result = [];
 
         $count = count($values);
@@ -1216,11 +1222,12 @@ private function parseQualityValues(string $header) : array
     /**
      * Parses a header with multiple values and optional parameters.
      *
-     * Example: text/html; charset=utf8, text/xml => ['text/html' => ['charset' => 'utf8'], 'text/xml' => []]
+     * Example: text/html; charset=utf8, text/xml
+     *       => ['text/html' => ['charset' => 'utf8'], 'text/xml' => []]
      *
      * @param string $header The header to parse.
      *
-     * @return array An associative array of values and theirs parameters.
+     * @return array<string, array<string, string>> An associative array of values and theirs parameters.
      */
     private function parseHeaderParameters(string $header) : array
     {