formatting and comment tweaks

src/http/HeaderCollection.php

@@ -17,6 +17,8 @@ class HeaderCollection
     protected $keyMap = [];
 
     /**
+     * Retrieve a key that can be used in a hashmap to prevent duplicate keys
+     *
      * @param string $key
      * @param bool $register Whether to register a new key
      * @return string
@@ -26,8 +28,7 @@ protected function getKey(string $key, bool $register = false): string
         $lowercaseKey = strtolower($key);
         if (isset($this->keyMap[$lowercaseKey])) {
             $key = $this->keyMap[$lowercaseKey];
-        }
-        elseif ($register) {
+        } elseif ($register) {
             $this->keyMap[$lowercaseKey] = $key;
         }
         return $key;
@@ -99,7 +100,7 @@ public function get(string $key): string
     /**
      * Get multiple header values
      *
-     * @param string $key
+     * @param string ...$keys
      * @return array<string>
      */
     public function getMultiple(string ...$keys): array

src/http/Request.php

@@ -23,7 +23,7 @@ class Request implements RequestParameterDecoderInterface
     /**
      * Headers are parsed and cached here
      *
-     * @var array<string>
+     * @var array<string,string>
      */
     protected $headers;
 
@@ -135,11 +135,11 @@ public function getIp(): string
      */
     public function getHeader(string $name, string $default = ""): string
     {
-        if (!$this->headers) {
+        if ($this->headers === null) {
             $this->headers = $this->readHeaders();
         }
-        $name = strtolower($name);
-        return $this->headers[$name] ?? $default;
+        $lowercaseName = strtolower($name);
+        return $this->headers[$lowercaseName] ?? $default;
     }
 
     /**

src/http/Response.php

@@ -25,6 +25,11 @@ class Response
      */
     protected $statusText = "OK";
 
+    /**
+     * @var \sndsgd\http\HeaderCollection
+     */
+    protected $headers;
+
     /**
      * Once the body has been generated it is stored here
      *

src/http/data/decoder/MultipartDataDecoder.php

@@ -109,8 +109,7 @@ public function decode(): array
                 if ($this->fileCount < $this->maxFileCount) {
                     $value = $this->getFileFromField($name, $filename, $contentType);
                     $this->values->addValue($name, $value);
-                }
-                else {
+                } else {
 
                 }
 
@@ -224,7 +223,8 @@ protected function getFieldHeader()
             );
         }
 
-        list($match, $name, $filename) = array_pad($matches, 3, "");
+        # we have no need for the entire match, so we drop it here
+        list( , $name, $filename) = array_pad($matches, 3, "");
 
         # if a filename was in the content disposition
         # attempt to find its content type in the field header
@@ -264,7 +264,7 @@ private function getValueFromField()
     /**
      * Allow for stubbing the result of tempnam using reflection
      *
-     * @return bool
+     * @return string
      */
     protected function getTempFilePath()
     {

src/http/data/decoder/QueryStringDecoder.php

@@ -46,21 +46,21 @@ public function __construct(
     }
 
     /**
-     * Decode a urlencoded parameter pair
+     * Decode a urlencoded parameter key value pair
      *
-     * @param string $pair
+     * @param string $keyValuePair
      * @return array<string> The decoded key and value
      */
-    public function decodePair(string $pair): array
+    public function decodePair(string $keyValuePair): array
     {
         # more than a handful of clients like to use '+' characters
         # when encoding data that is (almost) compliant with rfc 3986
         # this is a hack that allows for it
-        if (strpos($pair, "+") !== false) {
-            $pair = str_replace("+", " ", $pair);
+        if (strpos($keyValuePair, "+") !== false) {
+            $keyValuePair = str_replace("+", " ", $keyValuePair);
         }
 
-        $parts = explode("=", $pair, 2);
+        $parts = explode("=", $keyValuePair, 2);
         $key = rawurldecode($parts[0]);
 
         # interpret a key with an empty value as `null`
@@ -76,8 +76,8 @@ public function decodePair(string $pair): array
      */
     public function decode($query): array
     {
-        foreach (explode("&", $query) as $pair) {
-            list($key, $value) = $this->decodePair($pair);
+        foreach (explode("&", $query) as $keyValuePair) {
+            list($key, $value) = $this->decodePair($keyValuePair);
             $this->values->addValue($key, $value);
         }
         return $this->values->getValues();

src/http/request/BodyDecoder.php

@@ -119,8 +119,7 @@ protected function parsePost()
                         ]);
                         \sndsgd\Arr::addValue($ret, $name, $file);    
                     }
-                }
-                else {
+                } else {
                     $file = $this->createUploadedFile($info);
                     \sndsgd\Arr::addValue($ret, $name, $file);
                 }