Merge pull request #10 from cloudflare/COM-45

COM-45 :: Bugfix active status in Page Rules

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

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