Merge pull request #245 from bearsunday/http-client

Format http response headers

src/HalRenderer.php

@@ -12,6 +12,7 @@
 use function assert;
 use function http_build_query;
 use function is_array;
+use function is_object;
 use function is_scalar;
 use function json_decode;
 use function method_exists;
@@ -63,6 +64,10 @@ public function renderHal(ResourceObject $ro): void
 
     private function valuateElements(ResourceObject $ro): void
     {
+        if (is_object($ro->body)) {
+            $ro->body = (array) $ro->body;
+        }
+
         assert(is_array($ro->body));
         /** @var mixed $embeded */
         foreach ($ro->body as $key => &$embeded) {

src/HttpResourceObject.php

@@ -9,8 +9,10 @@
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
+use function count;
 use function is_array;
 use function strtoupper;
+use function ucwords;
 
 /**
  * @method HttpResourceObject get(AbstractUri|string $uri, array<string, mixed> $params = [])
@@ -56,7 +58,10 @@ public function __get(string $name)
         }
 
         if ($name === 'headers') {
-            return $this->response->getHeaders();
+            /** @var array<string, array<string>> $headers */
+            $headers = $this->response->getHeaders();
+
+            return $this->formatHeaeder($headers);
         }
 
         if ($name === 'body') {
@@ -70,6 +75,22 @@ public function __get(string $name)
         throw new InvalidArgumentException($name);
     }
 
+    /**
+     * @param array<string, array<string>> $headers
+     *
+     * @return array<string, string|array<string>>
+     */
+    private function formatHeaeder(array $headers): array
+    {
+        $formated = [];
+        foreach ($headers as $key => $header) {
+            $ucFirstKey = ucwords($key);
+            $formated[$ucFirstKey] = count($header) === 1 ? $header[0] : $header;
+        }
+
+        return $formated;
+    }
+
     /**
      * @param mixed $value
      */

src/ResourceObject.php

@@ -64,7 +64,7 @@ abstract class ResourceObject implements AcceptTransferInterface, ArrayAccess, C
     /**
      * Body
      *
-     * @var array<int|string, mixed>|mixed
+     * @var mixed
      */
     public $body;
 

tests/HttpResourceObjectTest.php

@@ -27,7 +27,7 @@ public function testGet(): HttpResourceObject
     {
         $response = $this->resource->get('http://httpbin.org/get', ['foo' => 'bar']);
         $this->assertSame(200, $response->code);
-        $this->assertArrayHasKey('access-control-allow-credentials', $response->headers);
+        $this->assertArrayHasKey('Access-control-allow-credentials', $response->headers);
         $this->assertArrayHasKey('args', $response->body);
         $this->assertStringContainsString('"args": {', (string) $response->view);
         assert($response instanceof HttpResourceObject);
@@ -39,7 +39,7 @@ public function testPost(): void
     {
         $response = $this->resource->post('http://httpbin.org/post', ['foo' => 'bar']);
         $this->assertSame(200, $response->code);
-        $this->assertArrayHasKey('access-control-allow-credentials', $response->headers);
+        $this->assertArrayHasKey('Access-control-allow-credentials', $response->headers);
         $body = $response->body;
         $this->assertSame('bar', $body['form']['foo']);
         $this->assertStringContainsString('"form": {', (string) $response->view);
@@ -49,7 +49,7 @@ public function testPut(): void
     {
         $response = $this->resource->put('http://httpbin.org/put', ['foo' => 'bar']);
         $this->assertSame(200, $response->code);
-        $this->assertArrayHasKey('access-control-allow-credentials', $response->headers);
+        $this->assertArrayHasKey('Access-control-allow-credentials', $response->headers);
         $body = $response->body;
         $this->assertSame('bar', $body['form']['foo']);
         $this->assertStringContainsString('"form": {', (string) $response->view);
@@ -59,7 +59,7 @@ public function testPatch(): void
     {
         $response = $this->resource->patch('http://httpbin.org/patch', ['foo' => 'bar']);
         $this->assertSame(200, $response->code);
-        $this->assertArrayHasKey('access-control-allow-credentials', $response->headers);
+        $this->assertArrayHasKey('Access-control-allow-credentials', $response->headers);
         $body = $response->body;
         $this->assertSame('bar', $body['form']['foo']);
         $this->assertStringContainsString('"form": {', (string) $response->view);
@@ -69,7 +69,7 @@ public function testDelete(): void
     {
         $response = $this->resource->delete('http://httpbin.org/delete', ['foo' => 'bar']);
         $this->assertSame(200, $response->code);
-        $this->assertArrayHasKey('access-control-allow-credentials', $response->headers);
+        $this->assertArrayHasKey('Access-control-allow-credentials', $response->headers);
         $body = $response->body;
         $this->assertSame('bar', $body['form']['foo']);
         $this->assertStringContainsString('"form": {', (string) $response->view);

tests/Renderer/HalRendererTest.php

@@ -164,4 +164,15 @@ public function testRenderNullBody(): void
 EOT;
         $this->assertSame($expected, $actual);
     }
+
+    public function testBodyObject(): void
+    {
+        $this->ro->body = new class {
+            /** @var int */
+            public $a = 1;
+        };
+        $actual = (string) $this->ro;
+
+        $this->assertStringContainsString('"a": 1,', $actual);
+    }
 }