- improved error consistency

- header name normalization

Author: kodeart

Client/CurlClient.php

@@ -70,8 +70,7 @@ public function read(): Response
                 \curl_getinfo($resource, CURLINFO_RESPONSE_CODE),
                 $this->responseHeaders);
         } catch (\TypeError $e) {
-            return $this->getPhpError(HttpStatus::FAILED_DEPENDENCY,
-                $e->getMessage());
+            return $this->getPhpError(HttpStatus::FAILED_DEPENDENCY, $e->getMessage());
         } catch (\Throwable $e) {
             return $this->getPhpError(HttpStatus::INTERNAL_SERVER_ERROR, $e->getMessage());
         } finally {
@@ -158,7 +157,7 @@ protected function prepareRequestBody(): void
         if (0 === $this->encoding) {
             $this->options[CURLOPT_POSTFIELDS] = $this->stream->getContents();
         } elseif ($content = \json_decode($this->stream->getContents() ?: '[]', true)) {
-            $this->normalizeHeader('Content-type', self::X_WWW_FORM_URLENCODED, true);
+            $this->normalizeHeader('Content-Type', self::X_WWW_FORM_URLENCODED, true);
             $this->options[CURLOPT_POSTFIELDS] = \http_build_query($content, null, '&', $this->encoding);
         }
         $this->stream = create_stream($this->options[CURLOPT_POSTFIELDS]);
@@ -173,7 +172,7 @@ protected function getCurlError(int $status, $resource): Response
             'instance' => \curl_getinfo($resource, CURLINFO_EFFECTIVE_URL),
             'type'     => 'https://httpstatuses.com/' . $status,
             'status'   => $status,
-        ]), $status, ['Content-type' => 'application/problem+json']);
+        ]), $status, ['Content-Type' => 'application/problem+json']);
     }
 
     /**

Client/PhpClient.php

@@ -61,14 +61,12 @@ public function read(): Response
             if ($this->hasError($resource)) {
                 return $this->getPhpError(HttpStatus::FAILED_DEPENDENCY);
             }
-            $this->extractFromResponseHeaders($resource, $headers, $statusCode);
+            $this->extractFromResponseHeaders($resource, $statusCode, $headers);
             return new ServerResponse(\stream_get_contents($resource), $statusCode, $headers);
         } catch (\ValueError $e) {
             return $this->getPhpError(HttpStatus::FAILED_DEPENDENCY, $e->getMessage());
         } catch (\Throwable $e) {
-            return $this->getPhpError(
-                $e->getCode() ?: HttpStatus::INTERNAL_SERVER_ERROR,
-                $e->getMessage());
+            return $this->getPhpError(HttpStatus::INTERNAL_SERVER_ERROR, $e->getMessage());
         } finally {
             if (\is_resource($resource)) {
                 \fclose($resource);
@@ -137,7 +135,7 @@ protected function prepareRequestBody(): void
         if (0 === $this->encoding) {
             $this->options['content'] = $this->stream->getContents();
         } elseif ($content = \json_decode($this->stream->getContents() ?: '[]', true)) {
-            $this->normalizeHeader('Content-type', self::X_WWW_FORM_URLENCODED, true);
+            $this->normalizeHeader('Content-Type', self::X_WWW_FORM_URLENCODED, true);
             $this->options['content'] = \http_build_query($content, null, '&', $this->encoding);
         }
         $this->stream = create_stream($this->options['content']);
@@ -159,20 +157,18 @@ protected function prepareOptions(): void
      * Extracts the headers and status code from the response.
      *
      * @param resource $response   The resource from fopen()
-     * @param array    $headers    Parsed response headers
      * @param int      $statusCode Response status code
+     * @param array    $headers    Parsed response headers
      */
-    protected function extractFromResponseHeaders($response, &$headers, &$statusCode): void
+    protected function extractFromResponseHeaders($response, &$statusCode, &$headers): void
     {
         try {
             $meta = \stream_get_meta_data($response)['wrapper_data'] ?? [];
             /* HTTP status may not always be the first header in the response headers,
              * for example, if the stream follows one or multiple redirects, the last
              * status line is what is expected here.
              */
-            $statusCode = \array_filter($meta, function(string $header) {
-                return \str_starts_with($header, 'HTTP/');
-            });
+            $statusCode = \array_filter($meta, fn(string $header) => \str_starts_with($header, 'HTTP/'));
             $statusCode = \array_pop($statusCode) ?: 'HTTP/1.1 200 OK';
             $statusCode = (int)(\explode(' ', $statusCode)[1] ?? HttpStatus::OK);
             foreach ($meta as $header) {

ClientRequest.php

@@ -189,6 +189,6 @@ protected function getPhpError(int $status, ?string $message = null): Response
             'instance' => (string)$this->getUri(),
             'type'     => 'https://httpstatuses.com/' . $status,
             'status'   => $status,
-        ]), $status, ['Content-type' => 'application/problem+json']);
+        ]), $status, ['Content-Type' => 'application/problem+json']);
     }
 }