Merge pull request #48 from chadicus/dev/content-type

Only set Content-Type header if request has body

Author: chadicus

composer.json

@@ -23,7 +23,9 @@
     "require": {
         "php": "^7.0",
         "ext-curl": "*",
+        "ext-json": "*",
         "lib-curl": "~7.15",
+        "fig/http-message-util": "^1.1",
         "guzzlehttp/guzzle": "^6.3",
         "psr/http-message": "^1.0",
         "psr/simple-cache": "^1.0",

src/Client.php

@@ -271,7 +271,12 @@ public function startDelete(string $resource, string $id = null, array $data = n
         }
 
         $json = $data !== null ? json_encode($data) : null;
-        return $this->start($url, 'DELETE', $json, ['Content-Type' => 'application/json']);
+        $headers = [];
+        if ($json !== null) {
+            $headers['Content-Type'] = 'application/json';
+        }
+
+        return $this->start($url, 'DELETE', $json, $headers);
     }
 
     /**
@@ -309,7 +314,12 @@ public function startSend(string $method, string $uri, array $data = null) : str
     {
         $url = "{$this->baseUrl}/{$uri}";
         $json = $data !== null ? json_encode($data) : null;
-        return $this->start($url, $method, $json, ['Content-Type' => 'application/json']);
+        $headers = [];
+        if ($json !== null) {
+            $headers['Content-Type'] = 'application/json';
+        }
+
+        return $this->start($url, $method, $json, $headers);
     }
 
     /**

tests/ClientTest.php

@@ -2,7 +2,7 @@
 
 namespace TraderInteractive\Api;
 
-use ArrayObject;
+use Fig\Http\Message\StatusCodeInterface as StatusCodes;
 use SubjectivePHP\Psr\SimpleCache\InMemoryCache;
 use DominionEnterprises\Util\Arrays;
 use DominionEnterprises\Util\Http;
@@ -585,7 +585,6 @@ function (RequestInterface $request) {
                 if ($request->getMethod() === 'DELETE'
                         && (string)$request->getUri() === 'baseUrl/v1/resource+name/the+id'
                         && $request->getHeaders() === [
-                            'Content-Type' => ['application/json'],
                             'Accept-Encoding' => ['gzip'],
                             'Authorization' => ['Bearer a token'],
                         ]
@@ -967,6 +966,37 @@ function (RequestInterface $request) {
         $this->assertSame(['a body'], $client->index('foos')->getResponse());
     }
 
+    /**
+     * @test
+     * @covers ::send
+     * @covers ::startSend
+     */
+    public function startSendDoesNotAddContentTypeHeaderIfNoJsonIsGiven()
+    {
+        $adapter = new FakeAdapter(
+            function (RequestInterface $request) {
+                if (substr($request->getUri(), -5) === 'token') {
+                    return new Psr7Response(
+                        StatusCodes::STATUS_OK,
+                        ['Content-Type' => ['application/json']],
+                        json_encode(['access_token' => 'a token', 'expires_in' => 1])
+                    );
+                }
+
+                $this->assertSame('GET', $request->getMethod());
+                $this->assertSame('baseUrl/v1/feeds/123/transport', (string)$request->getUri());
+                $this->assertSame('', (string)$request->getBody());
+                $this->assertSame([], $request->getHeader('Content-Type'));
+                return new Psr7Response(StatusCodes::STATUS_OK);
+            }
+        );
+
+        $client = new Client($adapter, $this->getAuthentication(), 'baseUrl/v1');
+
+        $response = $client->send('GET', 'feeds/123/transport');
+        $this->assertSame(StatusCodes::STATUS_OK, $response->getHttpCode());
+    }
+
     private function getAuthentication() : Authentication
     {
         return Authentication::createClientCredentials('not under test', 'not under test');