fix: httpclient - header return 100-continue and write queue with empty value (#29)

Co-authored-by: awu <[email protected]>

Author: wundii

src/Stream/CurlFactory.php

@@ -34,9 +34,11 @@ public static function create(
         $contentType = null;
         $options[CURLOPT_HEADERFUNCTION] = function (?CurlHandle $curlHandle, string $header) use (&$queueHeader, &$contentType): int {
             $queueHeader->write($header);
+
             if (preg_match('/^Content-Type:\s*(.+)$/i', $header, $matches)) {
                 $contentType = strtolower(trim($matches[1]));
             }
+
             return strlen($header);
         };
 

src/Stream/HttpClient.php

@@ -31,34 +31,46 @@ public function buildUri(string $uri): string
         return $buildUri;
     }
 
-    public function get(string $uri, ?string $apiToken = null): Response
+    public function buildHeaders(?string $apiToken, null|array|object $body = null): array
     {
-        $header = $apiToken !== null ? ['Authorization: Bearer ' . $apiToken] : [];
+        $headers = ['Expect:'];
+        if ($apiToken !== null) {
+            $headers[] = 'Authorization: Bearer ' . $apiToken;
+        }
+        if ($body !== null) {
+            $headers[] = 'Content-Type: application/json';
+        }
+
+        return $headers;
+    }
+
+    public function buildBody(null|array|object $body): string
+    {
+        if ($body === null) {
+            return '';
+        }
 
+        return json_encode($body);
+    }
+
+    public function get(string $uri, ?string $apiToken = null): Response
+    {
         $request = new Request(
             'GET',
             $this->buildUri($uri),
-            $header,
+            $this->buildHeaders($apiToken),
         );
 
         return $this->sendRequest($request);
     }
 
-    public function post(string $uri, ?string $apiToken = null, null|array|object $jsonValue = null): Response
+    public function post(string $uri, ?string $apiToken = null, null|array|object $body = null): Response
     {
-        $header = [];
-        if ($apiToken !== null) {
-            $header[] = 'Authorization: Bearer ' . $apiToken;
-        }
-        if ($jsonValue !== null) {
-            $header[] = 'Content-Type: application/json';
-        }
-
         $request = new Request(
             'POST',
             $this->buildUri($uri),
-            $header,
-            json_encode($jsonValue),
+            $this->buildHeaders($apiToken, $body),
+            $this->buildBody($body),
         );
 
         return $this->sendRequest($request);

src/Stream/Queue.php

@@ -32,7 +32,7 @@ public function read(): string
 
     public function write(string $data): void
     {
-        if ($data === '') {
+        if (trim($data) === '') {
             return;
         }
 

tests/Stream/HttpClientTest.php

@@ -97,4 +97,75 @@ public static function callContentTypes(): \Iterator
             false,
         ];
     }
+
+    public function testReturnsOnlyAuthorizationHeader(): void
+    {
+        $httpClient = new HttpClient();
+        $headers = $httpClient->buildHeaders('secret');
+
+        $this->assertCount(2, $headers);
+        $this->assertContains('Expect:', $headers, 'Ignore curl response header 100-continue');
+        $this->assertContains('Authorization: Bearer secret', $headers);
+    }
+
+    public function testReturnsAuthorizationAndJsonHeaderWithArrayBody(): void
+    {
+        $httpClient = new HttpClient();
+        $headers = $httpClient->buildHeaders('secret', [
+            'foo' => 'bar',
+        ]);
+
+        $this->assertCount(3, $headers);
+        $this->assertContains('Expect:', $headers, 'Ignore curl response header 100-continue');
+        $this->assertContains('Authorization: Bearer secret', $headers);
+        $this->assertContains('Content-Type: application/json', $headers);
+    }
+
+    public function testReturnsJsonHeaderWithoutToken(): void
+    {
+        $httpClient = new HttpClient();
+        $headers = $httpClient->buildHeaders(null, [
+            'data' => 123,
+        ]);
+
+        $this->assertCount(2, $headers);
+        $this->assertContains('Expect:', $headers, 'Ignore curl response header 100-continue');
+        $this->assertContains('Content-Type: application/json', $headers);
+    }
+
+    public function testReturnsEmptyHeadersWhenNoArgumentsGiven(): void
+    {
+        $httpClient = new HttpClient();
+        $headers = $httpClient->buildHeaders(null);
+        $this->assertSame(['Expect:'], $headers);
+    }
+
+    public function testReturnsEmptyStringForNull(): void
+    {
+        $httpClient = new HttpClient();
+        $result = $httpClient->buildBody(null);
+        $this->assertSame('', $result);
+    }
+
+    public function testReturnsJsonEncodedStringForArray(): void
+    {
+        $array = [
+            'foo' => 'bar',
+        ];
+
+        $httpClient = new HttpClient();
+        $result = $httpClient->buildBody($array);
+        $this->assertSame(json_encode($array), $result);
+    }
+
+    public function testReturnsJsonEncodedStringForObject(): void
+    {
+        $obj = (object) [
+            'baz' => 'qux',
+        ];
+
+        $httpClient = new HttpClient();
+        $result = $httpClient->buildBody($obj);
+        $this->assertSame(json_encode($obj), $result);
+    }
 }

tests/Stream/QueueTest.php

@@ -62,4 +62,14 @@ public function testGetIteratorReturnsAllItemsInOrder(): void
         $items = iterator_to_array($queue);
         $this->assertSame(['first', 'second'], $items);
     }
+
+    public function testWriteTabAndLineBreak(): void
+    {
+        $queue = new Queue();
+        $queue->write("\n");
+        $queue->write("\t");
+        $queue->write("\t\n");
+
+        $this->assertTrue($queue->isEmpty());
+    }
 }