Merge pull request #10 from cloudflare/COM-45

COM-45 :: Bugfix active status in Page Rules

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
             ]
         );
 

src/Endpoints/PageRules.php

@@ -35,7 +35,7 @@ class PageRules implements API
         ];
 
         if ($active !== null) {
-            $options['active'] = $active == true ? 'active' : 'disabled';
+            $options['status'] = $active == true ? 'active' : 'disabled';
         }
 
         if ($priority !== null) {
@@ -60,7 +60,7 @@ class PageRules implements API
         string $order = null,
         string $direction = null,
         string $match = null
-    ): \stdClass {
+    ): array {
         if (is_null($status) && !in_array($status, ['active', 'disabled'])) {
             throw new EndpointException('Page Rules can only be listed by status of active or disabled.');
         }
@@ -89,11 +89,7 @@ class PageRules implements API
         $user = $this->adapter->get('zones/' . $zoneID . '/pagerules?' . $query, []);
         $body = json_decode($user->getBody());
 
-        $result = new \stdClass();
-        $result->result = $body->result;
-        $result->result_info = $body->result_info;
-
-        return $result;
+        return $body->result;
     }
 
     public function getPageRuleDetails(string $zoneID, string $ruleID): \stdClass
@@ -121,7 +117,7 @@ class PageRules implements API
         }
 
         if ($active !== null) {
-            $options['active'] = $active == true ? 'active' : 'disabled';
+            $options['status'] = $active == true ? 'active' : 'disabled';
         }
 
         if ($priority !== null) {

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.");

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()

tests/Endpoints/PageRulesTest.php

@@ -57,8 +57,8 @@ class PageRulesTest extends PHPUnit_Framework_TestCase
                 $this->equalTo([
                     'targets' => $target->getArray(),
                     'actions' => $action->getArray(),
-                    'active' => 'active',
-                    'priority' => '1'
+                    'status' => 'active',
+                    'priority' => 1
                 ])
             );
 
@@ -217,8 +217,8 @@ class PageRulesTest extends PHPUnit_Framework_TestCase
                 $this->equalTo([
                     'targets' => $target->getArray(),
                     'actions' => $action->getArray(),
-                    'active' => 'active',
-                    'priority' => '1'
+                    'status' => 'active',
+                    'priority' => 1
                 ])
             );
 

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);
     }