Merge pull request #142 from deathiop/204

feat: handle 204 / empty bodies
ovh · Oct 20, 2023 · a5241f8 · a5241f8
2 parents d2c2161 + 75455ff
commit a5241f8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 8 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2017, OVH SAS.
+Copyright (c) 2013-2023, OVH SAS.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/src/Api.php b/src/Api.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2017, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -329,6 +329,9 @@ protected function rawCall($method, $path, $content = null, $is_authenticated =
      */
     private function decodeResponse(Response $response)
     {
+        if ($response->getStatusCode() === 204 || $response->getBody()->getSize() === 0) {
+            return null;
+        }
         return json_decode($response->getBody(), true, 512, JSON_THROW_ON_ERROR);
     }
 

diff --git a/src/Exceptions/ApiException.php b/src/Exceptions/ApiException.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2017, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/src/Exceptions/InvalidParameterException.php b/src/Exceptions/InvalidParameterException.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2017, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/src/Exceptions/NotLoggedException.php b/src/Exceptions/NotLoggedException.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2017, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/tests/ApiFunctionalTest.php b/tests/ApiFunctionalTest.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2017, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

diff --git a/tests/ApiTest.php b/tests/ApiTest.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2017, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -462,4 +462,29 @@ public function testVersionInUrl()
             $this->assertSame($test['sig'], $req->getHeaderLine('X-Ovh-Signature'));
         }
     }
+
+    public function testEmptyResponseBody()
+    {
+        $client = new MockClient(
+            // GET /auth/time
+            new Response(200, [], MOCK_TIME),
+            // POST /domain/zone/nonexisting.ovh/refresh
+            new Response(204, [], ''),
+        );
+
+        $api = new Api(MOCK_APPLICATION_KEY, MOCK_APPLICATION_SECRET, 'ovh-eu', MOCK_CONSUMER_KEY, $client);
+        $response = $api->post('/domain/zone/nonexisting.ovh/refresh');
+        $this->assertSame(null, $response);
+
+        $calls = $client->calls;
+        $this->assertCount(2, $calls);
+
+        $req = $calls[0]['request'];
+        $this->assertSame('GET', $req->getMethod());
+        $this->assertSame('https://eu.api.ovh.com/1.0/auth/time', $req->getUri()->__toString());
+
+        $req = $calls[1]['request'];
+        $this->assertSame('POST', $req->getMethod());
+        $this->assertSame('https://eu.api.ovh.com/1.0/domain/zone/nonexisting.ovh/refresh', $req->getUri()->__toString());
+    }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,5 +1,5 @@
 <?php
-# Copyright (c) 2013-2017, OVH SAS.
+# Copyright (c) 2013-2023, OVH SAS.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without