Fix for HEAD requests failing due to non-null message bodies

Victor Welling · jeskew · commit b5cc8c2ba2ba · 2018-01-25T09:54:48.000-08:00
diff --git a/src/ElasticsearchPhpHandler.php b/src/ElasticsearchPhpHandler.php
@@ -82,11 +82,19 @@ private function createPsr7Request(array $ringPhpRequest)
     private function createRingRequest(RequestInterface $request)
     {
         $uri = $request->getUri();
+        $body = (string) $request->getBody();
+
+        // RingPHP currently expects empty message bodies to be null:
+        // https://github.com/guzzle/RingPHP/blob/4c8fe4c48a0fb7cc5e41ef529e43fecd6da4d539/src/Client/CurlFactory.php#L202
+        if (empty($body)) {
+            $body = null;
+        }
+
         $ringRequest = [
             'http_method' => $request->getMethod(),
             'scheme' => $uri->getScheme(),
             'uri' => $uri->getPath(),
-            'body' => (string) $request->getBody(),
+            'body' => $body,
             'headers' => $request->getHeaders(),
         ];
         if ($uri->getQuery()) {
diff --git a/tests/ElasticsearchPhpHandlerTest.php b/tests/ElasticsearchPhpHandlerTest.php
@@ -61,6 +61,41 @@ public function testSignsWithProvidedCredentials()
         ]);
     }
 
+    public function testEmptyRequestBodiesShouldBeNull()
+    {
+        $toWrap = function (array $ringRequest) {
+            $this->assertNull($ringRequest['body']);
+
+            return $this->getGenericResponse();
+        };
+
+        $client = $this->getElasticsearchClient(
+            new ElasticsearchPhpHandler('us-west-2', null, $toWrap)
+        );
+
+        $client->indices()->exists(['index' => 'index']);
+    }
+
+    public function testNonEmptyRequestBodiesShouldNotBeNull()
+    {
+        $toWrap = function (array $ringRequest) {
+            $this->assertNotNull($ringRequest['body']);
+
+            return $this->getGenericResponse();
+        };
+
+        $client = $this->getElasticsearchClient(
+            new ElasticsearchPhpHandler('us-west-2', null, $toWrap)
+        );
+
+        $client->search([
+            'index' => 'index',
+            'body' => [
+                'query' => [ 'match_all' => (object)[] ],
+            ],
+        ]);
+    }
+
     private function getElasticsearchClient(ElasticsearchPhpHandler $handler)
     {
         $builder = ClientBuilder::create()
