Http: Review Headers

- Move `Headers` methods to `HttpUtil` and refactor:
  - `getContentLength()`
  - `getMultipartBoundary()`
  - `getPreferences()`
  - `mergePreferences()`
  - `getRetryAfter()`
- In `addLine()`:
  - Throw an exception on invalid header field syntax or line folding
    even if `$strict` is `false`
  - Throw `LogicException` if called after headers are applied via
    another method
  - Throw `InvalidHeaderException` instead of `InvalidArgumentException`
- In `map()`, return the instance if values are equivalent
- Fix `addLine()` issue where invalid line folding in the first trailer
  may not be detected
- Fix `getHeaderLine()` issue where values with unquoted commas may be
  inadvertently modified
- Use `getLastHeaderValue()` when retrieving `Content-Type` headers
- Use `getOnlyHeaderValue()` when retrieving `Location` headers

Author: lkrms

src/Toolkit/Contract/Http/HeadersInterface.php

@@ -5,6 +5,7 @@
 use Salient\Contract\Collection\DictionaryInterface;
 use Salient\Contract\Core\Arrayable;
 use Salient\Contract\Core\Immutable;
+use Salient\Contract\Http\Exception\InvalidHeaderException;
 use LogicException;
 use Stringable;
 
@@ -37,6 +38,7 @@ public function __construct($items = []);
      * @return static
      * @throws LogicException if headers have been applied to the instance via
      * another method.
+     * @throws InvalidHeaderException if `$line` is invalid.
      */
     public function addLine(string $line);
 

src/Toolkit/Curler/Curler.php

@@ -16,7 +16,6 @@
 use Salient\Contract\Curler\CurlerMiddlewareInterface;
 use Salient\Contract\Curler\CurlerPageRequestInterface;
 use Salient\Contract\Curler\CurlerPagerInterface;
-use Salient\Contract\Http\Exception\InvalidHeaderException as InvalidHeaderExceptionInterface;
 use Salient\Contract\Http\Exception\StreamEncapsulationException;
 use Salient\Contract\Http\Message\MultipartStreamInterface;
 use Salient\Contract\Http\Message\ResponseInterface;
@@ -307,12 +306,7 @@ private function responseIsJson(ResponseInterface $response): bool
         if (!$headers->hasHeader(self::HEADER_CONTENT_TYPE)) {
             return $this->ExpectJson;
         }
-        try {
-            $contentType = $headers->getOnlyHeaderValue(self::HEADER_CONTENT_TYPE);
-        } catch (InvalidHeaderExceptionInterface $ex) {
-            $this->debug($ex->getMessage());
-            return false;
-        }
+        $contentType = $headers->getLastHeaderValue(self::HEADER_CONTENT_TYPE);
         return HttpUtil::mediaTypeIs($contentType, self::TYPE_JSON);
     }
 
@@ -1139,7 +1133,7 @@ private function getResponse(PsrRequestInterface $request): ResponseInterface
         }
 
         if ($size === null || $size > 0) {
-            $size ??= Headers::from($request)->getContentLength();
+            $size ??= HttpUtil::getContentLength($request);
             if ($size !== null && $size <= static::MAX_INPUT_LENGTH) {
                 $body = (string) $body;
                 $opt[\CURLOPT_POSTFIELDS] = $body;
@@ -1369,8 +1363,7 @@ static function ($handle, string $data) use (&$bodyIn): int {
                 $redirects !== false
                 && $code >= 300
                 && $code < 400
-                && count($location = $headersIn->getHeader(self::HEADER_LOCATION)) === 1
-                && ($location = $location[0]) !== ''
+                && ($location = $headersIn->getOnlyHeaderValue(self::HEADER_LOCATION)) !== ''
             ) {
                 if (!$redirects) {
                     throw new TooManyRedirectsException(sprintf(
@@ -1422,7 +1415,7 @@ static function ($handle, string $data) use (&$bodyIn): int {
                 !$this->RetryAfterTooManyRequests
                 || $retrying
                 || $code !== 429
-                || ($after = $headersIn->getRetryAfter()) === null
+                || ($after = HttpUtil::getRetryAfter($headersIn)) === null
                 || ($this->RetryAfterMaxSeconds !== 0 && $after > $this->RetryAfterMaxSeconds)
             ) {
                 break;

src/Toolkit/Curler/Pager/ODataPager.php

@@ -8,7 +8,7 @@
 use Salient\Contract\Curler\CurlerPagerInterface;
 use Salient\Contract\Http\Message\ResponseInterface;
 use Salient\Curler\CurlerPage;
-use Salient\Http\Headers;
+use Salient\Http\HttpUtil;
 use Salient\Http\Uri;
 use Salient\Utility\Exception\InvalidArgumentTypeException;
 
@@ -41,7 +41,7 @@ public function getFirstRequest(
             return $request;
         }
 
-        $prefs = Headers::from($request)->getPreferences();
+        $prefs = HttpUtil::getPreferences($request);
         if (
             isset($prefs['odata.maxpagesize'])
             && $prefs['odata.maxpagesize']['value'] === (string) $this->MaxPageSize
@@ -53,7 +53,7 @@ public function getFirstRequest(
 
         return $request->withHeader(
             self::HEADER_PREFER,
-            Headers::mergePreferences($prefs),
+            HttpUtil::mergePreferences($prefs),
         );
     }