From 1baeeee88266e3c2852d674ffbce6d059d012979 Mon Sep 17 00:00:00 2001
From: Junade Ali <junade@cloudflare.com>
Date: Wed, 20 Sep 2017 13:15:34 +0100
Subject: [PATCH 1/2] COM-40 :: Change API submission type to JSON and adjust
 function names

---
 src/Adapter/Guzzle.php  | 6 +++---
 src/Endpoints/Zones.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Adapter/Guzzle.php b/src/Adapter/Guzzle.php
index fad8129..e9739e6 100644
--- a/src/Adapter/Guzzle.php
+++ b/src/Adapter/Guzzle.php
@@ -71,7 +71,7 @@ class Guzzle implements Adapter
 
         $response = $this->client->put($uri, [
                 'headers' => $headers,
-                'body' => $jsonBody
+                'json' => $jsonBody
             ]
         );
 
@@ -88,7 +88,7 @@ class Guzzle implements Adapter
 
         $response = $this->client->patch($uri, [
                 'headers' => $headers,
-                'body' => $jsonBody
+                'json' => $jsonBody
             ]
         );
 
@@ -103,7 +103,7 @@ class Guzzle implements Adapter
     {
         $response = $this->client->delete($uri, [
                 'headers' => $headers,
-                'form_params' => $body
+                'json' => $body
             ]
         );
 
diff --git a/src/Endpoints/Zones.php b/src/Endpoints/Zones.php
index 13dc83b..b81343d 100644
--- a/src/Endpoints/Zones.php
+++ b/src/Endpoints/Zones.php
@@ -108,7 +108,7 @@ class Zones implements API
      * @param string $zoneID
      * @return bool
      */
-    public function purgeAll(string $zoneID): bool
+    public function cachePurgeEverything(string $zoneID): bool
     {
         $user = $this->adapter->delete('zones/' . $zoneID . '/purge_cache', [], ["purge_everything" => true]);
 
@@ -121,7 +121,7 @@ class Zones implements API
         return false;
     }
 
-    public function purge(string $zoneID, array $files = [], array $tags = []): bool
+    public function cachePurge(string $zoneID, array $files = [], array $tags = []): bool
     {
         if (empty($files) && empty($tags)) {
             throw new EndpointException("No files or tags to purge.");

From 121209e4ca08f5cf021a081a38c03250c0aabb6c Mon Sep 17 00:00:00 2001
From: Junade Ali <junade@cloudflare.com>
Date: Wed, 20 Sep 2017 13:25:00 +0100
Subject: [PATCH 2/2] COM-45 :: Adjust Guzzle Tests

---
 tests/Adapter/GuzzleTest.php  | 6 +++---
 tests/Endpoints/ZonesTest.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/Adapter/GuzzleTest.php b/tests/Adapter/GuzzleTest.php
index 3d1e27a..88c3ff3 100644
--- a/tests/Adapter/GuzzleTest.php
+++ b/tests/Adapter/GuzzleTest.php
@@ -58,7 +58,7 @@ class GuzzleTest extends PHPUnit_Framework_TestCase
         $this->assertEquals("application/json", $headers["Content-Type"][0]);
 
         $body = json_decode($response->getBody());
-        $this->assertEquals("Testing a PUT request.", $body->json->{"X-Put-Test"});
+        $this->assertEquals("Testing a PUT request.", json_decode($body->json)->{"X-Put-Test"});
     }
 
     public function testPatch()
@@ -70,7 +70,7 @@ class GuzzleTest extends PHPUnit_Framework_TestCase
         $this->assertEquals("application/json", $headers["Content-Type"][0]);
 
         $body = json_decode($response->getBody());
-        $this->assertEquals("Testing a PATCH request.", $body->json->{"X-Patch-Test"});
+        $this->assertEquals("Testing a PATCH request.", json_decode($body->json)->{"X-Patch-Test"});
     }
 
     public function testDelete()
@@ -82,7 +82,7 @@ class GuzzleTest extends PHPUnit_Framework_TestCase
         $this->assertEquals("application/json", $headers["Content-Type"][0]);
 
         $body = json_decode($response->getBody());
-        $this->assertEquals("Testing a DELETE request.", $body->form->{"X-Delete-Test"});
+        $this->assertEquals("Testing a DELETE request.", $body->json->{"X-Delete-Test"});
     }
 
     public function testErrors()
diff --git a/tests/Endpoints/ZonesTest.php b/tests/Endpoints/ZonesTest.php
index b6bc87a..b3bc4d7 100644
--- a/tests/Endpoints/ZonesTest.php
+++ b/tests/Endpoints/ZonesTest.php
@@ -290,7 +290,7 @@ class ZonesTest extends PHPUnit_Framework_TestCase
         $this->assertEquals("023e105f4ecef8ad9ca31a8372d0c353", $result);
     }
 
-    public function testPurgeAll()
+    public function testCachePurgeEverything()
     {
         $stream = GuzzleHttp\Psr7\stream_for('{
   "success": true,
@@ -312,7 +312,7 @@ class ZonesTest extends PHPUnit_Framework_TestCase
             );
 
         $zones = new \Cloudflare\API\Endpoints\Zones($mock);
-        $result = $zones->purgeAll("c2547eb745079dac9320b638f5e225cf483cc5cfdda41");
+        $result = $zones->cachePurgeEverything("c2547eb745079dac9320b638f5e225cf483cc5cfdda41");
 
         $this->assertTrue($result);
     }