Merge pull request #8 from cloudflare/COM-45

COM-45 :: Change API submission type to JSON and adjust function names
cloudflare · Sep 20, 2017 · 2a39298 · 2a39298
2 parents a4ddb61 + 121209e
commit 2a39298
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Adapter/Guzzle.php b/src/Adapter/Guzzle.php
@@ -71,7 +71,7 @@ public function put(String $uri, array $headers = array(), array $body = array()
 
         $response = $this->client->put($uri, [
                 'headers' => $headers,
-                'body' => $jsonBody
+                'json' => $jsonBody
             ]
         );
 
@@ -88,7 +88,7 @@ public function patch(String $uri, array $headers = array(), array $body = array
 
         $response = $this->client->patch($uri, [
                 'headers' => $headers,
-                'body' => $jsonBody
+                'json' => $jsonBody
             ]
         );
 
@@ -103,7 +103,7 @@ public function delete(String $uri, array $headers = array(), array $body = arra
     {
         $response = $this->client->delete($uri, [
                 'headers' => $headers,
-                'form_params' => $body
+                'json' => $body
             ]
         );
 

diff --git a/src/Endpoints/Zones.php b/src/Endpoints/Zones.php
@@ -108,7 +108,7 @@ public function getZoneID(string $name = ""): string
      * @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 @@ public function purgeAll(string $zoneID): bool
         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.");

diff --git a/tests/Adapter/GuzzleTest.php b/tests/Adapter/GuzzleTest.php
@@ -58,7 +58,7 @@ public function testPut()
         $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 @@ public function testPatch()
         $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 @@ public function testDelete()
         $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
@@ -290,7 +290,7 @@ public function testGetZoneID()
         $this->assertEquals("023e105f4ecef8ad9ca31a8372d0c353", $result);
     }
 
-    public function testPurgeAll()
+    public function testCachePurgeEverything()
     {
         $stream = GuzzleHttp\Psr7\stream_for('{
   "success": true,
@@ -312,7 +312,7 @@ public function testPurgeAll()
             );
 
         $zones = new \Cloudflare\API\Endpoints\Zones($mock);
-        $result = $zones->purgeAll("c2547eb745079dac9320b638f5e225cf483cc5cfdda41");
+        $result = $zones->cachePurgeEverything("c2547eb745079dac9320b638f5e225cf483cc5cfdda41");
 
         $this->assertTrue($result);
     }