Revert "MX records need ability to set priority"

.gitignore

@@ -1,2 +1 @@
-/.idea
 /vendor/

README.md

@@ -4,7 +4,7 @@
 
 ## Installation
 
-The recommended way to install this package is via the Packagist Dependency Manager ([cloudflare/sdk](https://packagist.org/packages/cloudflare/sdk)). You can get specific usage examples on the Cloudflare Knowledge Base under: [Cloudflare PHP API Binding](https://support.cloudflare.com/hc/en-us/articles/115001661191)
+The recommended way to install this package is via the Packagist Dependency Manager ([cloudflare/sdk](https://packagist.org/packages/cloudflare/sdk)). You can specific usage examples on the Cloudflare Knowledge Base under: [Cloudflare PHP API Binding](https://support.cloudflare.com/hc/en-us/articles/115001661191)
 
 ## Cloudflare API version 4
 
@@ -18,8 +18,7 @@ Each API call is provided via a similarly named function within various classes
 - [x] [Page Rules](https://support.cloudflare.com/hc/en-us/articles/200168306-Is-there-a-tutorial-for-Page-Rules-)
 - [x] [Web Application Firewall (WAF)](https://www.cloudflare.com/waf/)
 - [ ] Virtual DNS Management
-- [x] Custom hostnames
-- [x] Manage TLS settings
+- [ ] Custom hostnames
 - [x] Zone Lockdown and User-Agent Block rules
 - [ ] Organization Administration
 - [x] [Railgun](https://www.cloudflare.com/railgun/) administration

composer.json

@@ -5,8 +5,7 @@
   "require": {
     "guzzlehttp/guzzle": "^6.2.2",
     "php": ">=7.0.0",
-    "psr/http-message": "~1.0",
-    "ext-json": "*"
+    "psr/http-message": "~1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "5.7.5",
@@ -29,10 +28,5 @@
     "classmap": [
         "tests/"
     ]
-  },
-  "config": {
-    "preferred-install": "dist",
-    "sort-packages": true,
-    "optimize-autoloader": true
   }
 }

src/Adapter/Adapter.php

@@ -31,46 +31,46 @@ interface Adapter
      * RFCs, it is never useful).
      *
      * @param string $uri
-     * @param array $data
+     * @param array $query
      * @param array $headers
      *
      * @return mixed
      */
-    public function get(string $uri, array $data = [], array $headers = []): ResponseInterface;
+    public function get(string $uri, array $query, array $headers): ResponseInterface;
 
     /**
      * @param string $uri
-     * @param array $data
      * @param array $headers
+     * @param array $body
      *
      * @return mixed
      */
-    public function post(string $uri, array $data = [], array $headers = []): ResponseInterface;
+    public function post(string $uri, array $headers, array $body): ResponseInterface;
 
     /**
      * @param string $uri
-     * @param array $data
      * @param array $headers
+     * @param array $body
      *
      * @return mixed
      */
-    public function put(string $uri, array $data = [], array $headers = []): ResponseInterface;
+    public function put(string $uri, array $headers, array $body): ResponseInterface;
 
     /**
      * @param string $uri
-     * @param array $data
      * @param array $headers
+     * @param array $body
      *
      * @return mixed
      */
-    public function patch(string $uri, array $data = [], array $headers = []): ResponseInterface;
+    public function patch(string $uri, array $headers, array $body): ResponseInterface;
 
     /**
      * @param string $uri
-     * @param array $data
      * @param array $headers
+     * @param array $body
      *
      * @return mixed
      */
-    public function delete(string $uri, array $data = [], array $headers = []): ResponseInterface;
+    public function delete(string $uri, array $headers, array $body): ResponseInterface;
 }

src/Adapter/Guzzle.php

@@ -37,56 +37,79 @@ class Guzzle implements Adapter
     /**
      * @inheritDoc
      */
-    public function get(string $uri, array $data = [], array $headers = []): ResponseInterface
+    public function get(string $uri, array $query = [], array $headers = []): ResponseInterface
     {
-        return $this->request('get', $uri, $data, $headers);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function post(string $uri, array $data = [], array $headers = []): ResponseInterface
-    {
-        return $this->request('post', $uri, $data, $headers);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function put(string $uri, array $data = [], array $headers = []): ResponseInterface
-    {
-        return $this->request('put', $uri, $data, $headers);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function patch(string $uri, array $data = [], array $headers = []): ResponseInterface
-    {
-        return $this->request('patch', $uri, $data, $headers);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function delete(string $uri, array $data = [], array $headers = []): ResponseInterface
-    {
-        return $this->request('delete', $uri, $data, $headers);
-    }
-
-    public function request(string $method, string $uri, array $data = [], array $headers = [])
-    {
-        if (!in_array($method, ['get', 'post', 'put', 'patch', 'delete'])) {
-            throw new \InvalidArgumentException('Request method must be get, post, put, patch, or delete');
-        }
-
-        $response = $this->client->$method($uri, [
-            'headers' => $headers,
-            ($method === 'get' ? 'query' : 'json') => $data,
-        ]);
+        $response = $this->client->get($uri, ['query' => $query, 'headers' => $headers]);
 
         $this->checkError($response);
+        return $response;
+    }
 
+    /**
+     * @inheritDoc
+     */
+    public function post(string $uri, array $headers = [], array $body = []): ResponseInterface
+    {
+        $response = $this->client->post(
+            $uri,
+            [
+                'headers' => $headers,
+                'json' => $body
+            ]
+        );
+
+        $this->checkError($response);
+        return $response;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function put(string $uri, array $headers = [], array $body = []): ResponseInterface
+    {
+        $response = $this->client->put(
+            $uri,
+            [
+                'headers' => $headers,
+                'json' => $body
+            ]
+        );
+
+        $this->checkError($response);
+        return $response;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function patch(string $uri, array $headers = [], array $body = []): ResponseInterface
+    {
+        $response = $this->client->patch(
+            $uri,
+            [
+                'headers' => $headers,
+                'json' => $body
+            ]
+        );
+
+        $this->checkError($response);
+        return $response;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function delete(string $uri, array $headers = [], array $body = []): ResponseInterface
+    {
+        $response = $this->client->delete(
+            $uri,
+            [
+                'headers' => $headers,
+                'json' => $body
+            ]
+        );
+
+        $this->checkError($response);
         return $response;
     }
 

src/Configurations/AccessRules.php

@@ -21,11 +21,6 @@ class AccessRules implements Configurations
         $this->config = ['target' => 'country', 'value' => $value];
     }
 
-    public function setASN(string $value)
-    {
-        $this->config = ['target' => 'asn', 'value' => $value];
-    }
-
     public function getArray(): array
     {
         return $this->config;

src/Configurations/PageRulesActions.php

@@ -132,11 +132,9 @@ class PageRulesActions implements Configurations
             throw new ConfigurationsException('Status Codes can only be 301 or 302.');
         }
 
-        $this->addConfigurationOption("forwarding_url", [
-            'value' => [
-                'status_code' => $statusCode,
-                'url' => $forwardingUrl,
-            ],
+        $this->addConfigurationOption('forwarding_url', [
+            'status_code' => $statusCode,
+            'url' => $forwardingUrl,
         ]);
     }
 
@@ -261,7 +259,7 @@ class PageRulesActions implements Configurations
             throw new ConfigurationsException('Can only be set to off, flexible, full, strict, origin_pull.');
         }
 
-        $this->addConfigurationOption('ssl', [
+        $this->addConfigurationOption('smart_errors', [
             'value' => $value
         ]);
     }
@@ -303,7 +301,7 @@ class PageRulesActions implements Configurations
     {
         $configuration['id'] = $setting;
 
-        array_push($this->configs, $configuration);
+        $this->configs[] = (object) $configuration;
     }
 
     private function getBoolAsOnOrOff(bool $value): string

src/Configurations/PageRulesTargets.php

@@ -15,9 +15,9 @@ class PageRulesTargets implements Configurations
     public function __construct(string $queryUrl)
     {
         $this->targets = [
-            [
+            (object)[
                 'target' => 'url',
-                'constraint' => [
+                'constraint' => (object)[
                     'operator' => 'matches',
                     'value' => $queryUrl
                 ]

src/Configurations/UARules.php

@@ -14,7 +14,7 @@ class UARules implements Configurations
 
     public function addUA(string $value)
     {
-        $this->configs[] = ['target' => 'ua', 'value' => $value];
+        $this->configs[] = (object)['target' => 'ua', 'value' => $value];
     }
 
     public function getArray(): array

src/Configurations/ZoneLockdown.php

@@ -14,12 +14,12 @@ class ZoneLockdown implements Configurations
 
     public function addIP(string $value)
     {
-        $this->configs[] = ['target' => 'ip', 'value' => $value];
+        $this->configs[] = (object)['target' => 'ip', 'value' => $value];
     }
 
     public function addIPRange(string $value)
     {
-        $this->configs[] = ['target' => 'ip_range', 'value' => $value];
+        $this->configs[] = (object)['target' => 'ip_range', 'value' => $value];
     }
 
     public function getArray(): array

src/Endpoints/AccessRules.php

@@ -4,12 +4,9 @@ namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
 use Cloudflare\API\Configurations\Configurations;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class AccessRules implements API
 {
-    use BodyAccessorTrait;
-    
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -80,10 +77,10 @@ class AccessRules implements API
             $query['notes'] = $notes;
         }
 
-        $data = $this->adapter->get('zones/' . $zoneID . '/firewall/access_rules/rules', $query);
-        $this->body = json_decode($data->getBody());
+        $data = $this->adapter->get('zones/' . $zoneID . '/firewall/access_rules/rules', $query, []);
+        $body = json_decode($data->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function createRule(
@@ -94,18 +91,18 @@ class AccessRules implements API
     ): bool {
         $options = [
             'mode' => $mode,
-            'configuration' => $configuration->getArray()
+            'configuration' => (object) $configuration->getArray()
         ];
 
         if ($notes !== null) {
             $options['notes'] = $notes;
         }
 
-        $query = $this->adapter->post('zones/' . $zoneID . '/firewall/access_rules/rules', $options);
+        $query = $this->adapter->post('zones/' . $zoneID . '/firewall/access_rules/rules', [], $options);
 
-        $this->body = json_decode($query->getBody());
+        $body = json_decode($query->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -126,11 +123,11 @@ class AccessRules implements API
             $options['notes'] = $notes;
         }
 
-        $query = $this->adapter->patch('zones/' . $zoneID . '/firewall/access_rules/rules/' . $ruleID, $options);
+        $query = $this->adapter->patch('zones/' . $zoneID . '/firewall/access_rules/rules/' . $ruleID, [], $options);
 
-        $this->body = json_decode($query->getBody());
+        $body = json_decode($query->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -143,11 +140,11 @@ class AccessRules implements API
             'cascade' => $cascade
         ];
 
-        $data = $this->adapter->delete('zones/' . $zoneID . '/firewall/access_rules/rules/' . $ruleID, $options);
+        $data = $this->adapter->delete('zones/' . $zoneID . '/firewall/access_rules/rules/' . $ruleID, [], $options);
 
-        $this->body = json_decode($data->getBody());
+        $body = json_decode($data->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 

src/Endpoints/CustomHostnames.php

@@ -1,153 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: junade
- * Date: 18/03/2018
- * Time: 21:46
- */
-
-namespace Cloudflare\API\Endpoints;
-
-use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
-
-class CustomHostnames implements API
-{
-    use BodyAccessorTrait;
-    
-    private $adapter;
-
-    public function __construct(Adapter $adapter)
-    {
-        $this->adapter = $adapter;
-    }
-
-
-    /**
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
-     *
-     * @param string $zoneID
-     * @param string $hostname
-     * @param string $sslMethod
-     * @param string $sslType
-     * @return \stdClass
-     */
-    public function addHostname(string $zoneID, string $hostname, string $sslMethod = 'http', string $sslType = 'dv'): \stdClass
-    {
-        $options = [
-            'hostname' => $hostname,
-            'ssl' => [
-                'method' => $sslMethod,
-                'type' => $sslType
-            ]
-        ];
-
-        $zone = $this->adapter->post('zones/'.$zoneID.'/custom_hostnames', $options);
-        $this->body = json_decode($zone->getBody());
-        return $this->body->result;
-    }
-
-    /**
-     * @param string $zoneID
-     * @param string $hostname
-     * @param string $id
-     * @param int $page
-     * @param int $perPage
-     * @param string $order
-     * @param string $direction
-     * @param int $ssl
-     * @return \stdClass
-     */
-    public function listHostnames(
-        string $zoneID,
-        string $hostname = '',
-        string $hostnameID = '',
-        int $page = 1,
-        int $perPage = 20,
-        string $order = '',
-        string $direction = '',
-        int $ssl = 0
-    ): \stdClass {
-        $query = [
-            'page' => $page,
-            'per_page' => $perPage,
-            'ssl' => $ssl
-        ];
-
-        if (!empty($hostname)) {
-            $query['hostname'] = $hostname;
-        }
-
-        if (!empty($hostnameID)) {
-            $query['id'] = $hostnameID;
-        }
-
-        if (!empty($order)) {
-            $query['order'] = $order;
-        }
-
-        if (!empty($direction)) {
-            $query['direction'] = $direction;
-        }
-
-        $zone = $this->adapter->get('zones/'.$zoneID.'/custom_hostnames', $query);
-        $this->body = json_decode($zone->getBody());
-
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
-    }
-
-    /**
-     * @param string $zoneID
-     * @param string $hostnameID
-     * @return mixed
-     */
-    public function getHostname(string $zoneID, string $hostnameID)
-    {
-        $zone = $this->adapter->get('zones/'.$zoneID.'/custom_hostnames/'.$hostnameID);
-        $this->body = json_decode($zone->getBody());
-
-        return $this->body->result;
-    }
-
-    /**
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
-     *
-     * @param string $zoneID
-     * @param string $hostnameID
-     * @param string $sslMethod
-     * @param string $sslType
-     * @return \stdClass
-     */
-    public function updateHostname(string $zoneID, string $hostnameID, string $sslMethod = '', string $sslType = ''): \stdClass
-    {
-        $query = [];
-
-        if (!empty($sslMethod)) {
-            $query['method'] = $sslMethod;
-        }
-
-        if (!empty($sslType)) {
-            $query['type'] = $sslType;
-        }
-
-        $options = [
-            'ssl' => $query
-        ];
-
-        $zone = $this->adapter->patch('zones/'.$zoneID.'/custom_hostnames/'.$hostnameID, $options);
-        $this->body = json_decode($zone->getBody());
-        return $this->body->result;
-    }
-
-    /**
-     * @param string $zoneID
-     * @param string $hostnameID
-     * @return \stdClass
-     */
-    public function deleteHostname(string $zoneID, string $hostnameID): \stdClass
-    {
-        $zone = $this->adapter->delete('zones/'.$zoneID.'/custom_hostnames/'.$hostnameID);
-        $this->body = json_decode($zone->getBody());
-        return $this->body;
-    }
-}

src/Endpoints/DNS.php

@@ -9,12 +9,9 @@
 namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class DNS implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -31,8 +28,6 @@ class DNS implements API
      * @param string $content
      * @param int $ttl
      * @param bool $proxied
-     * @param string $priority
-     * @param array $data
      * @return bool
      */
     public function addRecord(
@@ -41,9 +36,7 @@ class DNS implements API
         string $name,
         string $content,
         int $ttl = 0,
-        bool $proxied = true,
-        string $priority = '',
-        array $data = []
+        bool $proxied = true
     ): bool {
         $options = [
             'type' => $type,
@@ -56,19 +49,11 @@ class DNS implements API
             $options['ttl'] = $ttl;
         }
 
-        if (!empty($priority)) {
-            $options['priority'] = (int)$priority;
-        }
-        
-        if (!empty($data)) {
-            $options['data'] = $data;
-        }
+        $user = $this->adapter->post('zones/' . $zoneID . '/dns_records', [], $options);
 
-        $user = $this->adapter->post('zones/' . $zoneID . '/dns_records', $options);
+        $body = json_decode($user->getBody());
 
-        $this->body = json_decode($user->getBody());
-
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -112,33 +97,32 @@ class DNS implements API
             $query['direction'] = $direction;
         }
 
-        $user = $this->adapter->get('zones/' . $zoneID . '/dns_records', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones/' . $zoneID . '/dns_records', $query, []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function getRecordDetails(string $zoneID, string $recordID): \stdClass
     {
-        $user = $this->adapter->get('zones/' . $zoneID . '/dns_records/' . $recordID);
-        $this->body = json_decode($user->getBody());
-        return $this->body->result;
+        $user = $this->adapter->get('zones/' . $zoneID . '/dns_records/' . $recordID, [], []);
+        $body = json_decode($user->getBody());
+        return $body->result;
     }
 
     public function updateRecordDetails(string $zoneID, string $recordID, array $details): \stdClass
     {
-        $response = $this->adapter->put('zones/' . $zoneID . '/dns_records/' . $recordID, $details);
-        $this->body = json_decode($response->getBody());
-        return $this->body;
+        $response = $this->adapter->put('zones/' . $zoneID . '/dns_records/' . $recordID, [], $details);
+        return json_decode($response->getBody());
     }
 
     public function deleteRecord(string $zoneID, string $recordID): bool
     {
-        $user = $this->adapter->delete('zones/' . $zoneID . '/dns_records/' . $recordID);
+        $user = $this->adapter->delete('zones/' . $zoneID . '/dns_records/' . $recordID, [], []);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 

src/Endpoints/IPs.php

@@ -9,12 +9,9 @@
 namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class IPs implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -24,9 +21,9 @@ class IPs implements API
 
     public function listIPs(): \stdClass
     {
-        $ips = $this->adapter->get('ips');
-        $this->body = json_decode($ips->getBody());
+        $ips = $this->adapter->get('ips', [], []);
+        $body = json_decode($ips->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 }

src/Endpoints/Membership.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace Cloudflare\API\Endpoints;
-
-use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
-
-/* A list of memberships of accounts this user can access */
-
-class Membership implements API
-{
-    use BodyAccessorTrait;
-
-    private $adapter;
-
-    public function __construct(Adapter $adapter)
-    {
-        $this->adapter = $adapter;
-    }
-
-
-    public function listMemberships(
-        string $name = '',
-        string $status = '',
-        int $page = 1,
-        int $perPage = 20,
-        string $order = '',
-        string $direction = ''
-    ): \stdClass {
-        $query = [
-            'page' => $page,
-            'per_page' => $perPage
-        ];
-
-        if (!empty($name)) {
-            $query['account.name'] = $name;
-        }
-
-        if (!empty($status) && in_array($status, ['accepted', 'pending', 'rejected'], true)) {
-            $query['status'] = $status;
-        }
-
-        if (!empty($order) && in_array($order, ['id', 'account.name', 'status'], true)) {
-            $query['order'] = $order;
-        }
-
-        if (!empty($direction) && in_array($direction, ['asc', 'desc'], true)) {
-            $query['direction'] = $direction;
-        }
-
-        $memberships = $this->adapter->get('memberships', $query);
-        $this->body = json_decode($memberships->getBody());
-
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
-    }
-
-    public function getMembershipDetails(string $membershipId): \stdClass
-    {
-        $membership = $this->adapter->get(sprintf('memberships/%s', $membershipId));
-        $this->body = json_decode($membership->getBody());
-        return $this->body->result;
-    }
-
-    public function updateMembershipStatus(string $membershipId, string $status): \stdClass
-    {
-        $response = $this->adapter->put(sprintf('memberships/%s', $membershipId), ['status' => $status]);
-        $this->body = json_decode($response->getBody());
-        return $this->body;
-    }
-
-    public function deleteMembership(string $membershipId): bool
-    {
-        $response = $this->adapter->delete(sprintf('memberships/%s', $membershipId));
-
-        $this->body = json_decode($response->getBody());
-
-        if (isset($this->body->result->id)) {
-            return true;
-        }
-
-        return false;
-    }
-}

src/Endpoints/PageRules.php

@@ -11,12 +11,9 @@ namespace Cloudflare\API\Endpoints;
 use Cloudflare\API\Adapter\Adapter;
 use Cloudflare\API\Configurations\PageRulesActions;
 use Cloudflare\API\Configurations\PageRulesTargets;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class PageRules implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -55,11 +52,11 @@ class PageRules implements API
         }
 
 
-        $query = $this->adapter->post('zones/' . $zoneID . '/pagerules', $options);
+        $query = $this->adapter->post('zones/' . $zoneID . '/pagerules', [], $options);
 
-        $this->body = json_decode($query->getBody());
+        $body = json_decode($query->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -96,17 +93,17 @@ class PageRules implements API
             'match' => $match
         ];
 
-        $user = $this->adapter->get('zones/' . $zoneID . '/pagerules', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones/' . $zoneID . '/pagerules', $query, []);
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 
     public function getPageRuleDetails(string $zoneID, string $ruleID): \stdClass
     {
-        $user = $this->adapter->get('zones/' . $zoneID . '/pagerules/' . $ruleID);
-        $this->body = json_decode($user->getBody());
-        return $this->body->result;
+        $user = $this->adapter->get('zones/' . $zoneID . '/pagerules/' . $ruleID, [], []);
+        $body = json_decode($user->getBody());
+        return $body->result;
     }
 
     public function updatePageRule(
@@ -135,11 +132,11 @@ class PageRules implements API
         }
 
 
-        $query = $this->adapter->patch('zones/' . $zoneID . '/pagerules', $options);
+        $query = $this->adapter->patch('zones/' . $zoneID . '/pagerules', [], $options);
 
-        $this->body = json_decode($query->getBody());
+        $body = json_decode($query->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -148,11 +145,11 @@ class PageRules implements API
 
     public function deletePageRule(string $zoneID, string $ruleID): bool
     {
-        $user = $this->adapter->delete('zones/' . $zoneID . '/pagerules/' . $ruleID);
+        $user = $this->adapter->delete('zones/' . $zoneID . '/pagerules/' . $ruleID, [], []);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 

src/Endpoints/Railgun.php

@@ -9,12 +9,9 @@
 namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class Railgun implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -29,10 +26,10 @@ class Railgun implements API
             'name' => $name,
         ];
 
-        $user = $this->adapter->post('railguns', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->post('railguns', [], $query);
+        $body = json_decode($user->getBody());
 
-        return $this->body;
+        return $body;
     }
 
     public function list(
@@ -49,28 +46,28 @@ class Railgun implements API
             $query['direction'] = $direction;
         }
 
-        $user = $this->adapter->get('railguns', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('railguns', $query, []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function get(
         string $railgunID
     ): \stdClass {
-        $user = $this->adapter->get('railguns/' . $railgunID);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('railguns/' . $railgunID, [], []);
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 
     public function getZones(
         string $railgunID
     ): \stdClass {
-        $user = $this->adapter->get('railguns/' . $railgunID . '/zones');
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('railguns/' . $railgunID . '/zones', [], []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function update(
@@ -81,19 +78,19 @@ class Railgun implements API
             'enabled' => $status
         ];
 
-        $user = $this->adapter->patch('railguns/' . $railgunID, $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->patch('railguns/' . $railgunID, [], $query);
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 
     public function delete(
         string $railgunID
     ): bool {
-        $user = $this->adapter->delete('railguns/' . $railgunID);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->delete('railguns/' . $railgunID, [], []);
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 

src/Endpoints/TLS.php

@@ -1,131 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Jurgen Coetsiers
- * Date: 21/10/2018
- * Time: 09:10
- */
-
-namespace Cloudflare\API\Endpoints;
-
-use Cloudflare\API\Adapter\Adapter;
-
-class TLS implements API
-{
-    private $adapter;
-
-    public function __construct(Adapter $adapter)
-    {
-        $this->adapter = $adapter;
-    }
-
-    public function enableTLS13($zoneID)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/tls_1_3',
-            ['value' => 'on']
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function disableTLS13($zoneID)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/tls_1_3',
-            ['value' => 'off']
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-
-    public function changeMinimumTLSVersion($zoneID, $minimumVersion)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/min_tls_version',
-            [
-                'value' => $minimumVersion,
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function getHTTPSRedirectSetting($zoneID)
-    {
-        $return = $this->adapter->get(
-            'zones/' . $zoneID . '/settings/always_use_https'
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return $body->result->value;
-        }
-
-        return false;
-    }
-
-    public function getHTTPSRewritesSetting($zoneID)
-    {
-        $return = $this->adapter->get(
-            'zones/' . $zoneID . '/settings/automatic_https_rewrites'
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return $body->result->value;
-        }
-
-        return false;
-    }
-
-    public function updateHTTPSRedirectStatus($zoneID, $value)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/always_use_https',
-            [
-                'value' => $value,
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function updateHTTPSRewritesStatus($zoneID, $value)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/automatic_https_rewrites',
-            [
-                'value' => $value,
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-}

src/Endpoints/UARules.php

@@ -10,12 +10,9 @@ namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Configurations\Configurations;
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class UARules implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -33,10 +30,10 @@ class UARules implements API
             'per_page' => $perPage
         ];
 
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/ua_rules', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/ua_rules', $query, []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function createRule(
@@ -59,11 +56,11 @@ class UARules implements API
             $options['description'] = $description;
         }
 
-        $user = $this->adapter->post('zones/' . $zoneID . '/firewall/ua_rules', $options);
+        $user = $this->adapter->post('zones/' . $zoneID . '/firewall/ua_rules', [], $options);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -72,9 +69,9 @@ class UARules implements API
 
     public function getRuleDetails(string $zoneID, string $blockID): \stdClass
     {
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/ua_rules/' . $blockID);
-        $this->body = json_decode($user->getBody());
-        return $this->body->result;
+        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/ua_rules/' . $blockID, [], []);
+        $body = json_decode($user->getBody());
+        return $body->result;
     }
 
     public function updateRule(
@@ -94,11 +91,11 @@ class UARules implements API
             $options['description'] = $description;
         }
 
-        $user = $this->adapter->put('zones/' . $zoneID . '/firewall/ua_rules/' . $ruleID, $options);
+        $user = $this->adapter->put('zones/' . $zoneID . '/firewall/ua_rules/' . $ruleID, [], $options);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -107,11 +104,11 @@ class UARules implements API
 
     public function deleteRule(string $zoneID, string $ruleID): bool
     {
-        $user = $this->adapter->delete('zones/' . $zoneID . '/firewall/ua_rules/' . $ruleID);
+        $user = $this->adapter->delete('zones/' . $zoneID . '/firewall/ua_rules/' . $ruleID, [], []);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 

src/Endpoints/User.php

@@ -8,12 +8,9 @@
 namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class User implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -23,9 +20,9 @@ class User implements API
 
     public function getUserDetails(): \stdClass
     {
-        $user = $this->adapter->get('user');
-        $this->body = json_decode($user->getBody());
-        return $this->body->result;
+        $user = $this->adapter->get('user', [], []);
+        $body = json_decode($user->getBody());
+        return $body->result;
     }
 
     public function getUserID(): string
@@ -40,8 +37,7 @@ class User implements API
 
     public function updateUserDetails(array $details): \stdClass
     {
-        $response = $this->adapter->patch('user', $details);
-        $this->body = json_decode($response->getBody());
-        return $this->body;
+        $response = $this->adapter->patch('user', [], $details);
+        return json_decode($response->getBody());
     }
 }

src/Endpoints/WAF.php

@@ -9,12 +9,9 @@
 namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class WAF implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -44,10 +41,10 @@ class WAF implements API
             $query['direction'] = $direction;
         }
 
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages', $query, []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
 
@@ -55,10 +52,10 @@ class WAF implements API
         string $zoneID,
         string $packageID
     ): \stdClass {
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages/' . $packageID);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages/' . $packageID, [], []);
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 
     public function getRules(
@@ -83,10 +80,10 @@ class WAF implements API
         if (!empty($direction)) {
             $query['direction'] = $direction;
         }
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/rules', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/rules', $query, []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function getRuleInfo(
@@ -94,10 +91,14 @@ class WAF implements API
         string $packageID,
         string $ruleID
     ): \stdClass {
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/rules/' . $ruleID);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get(
+            'zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/rules/' . $ruleID,
+            [],
+            []
+        );
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 
     public function updateRule(
@@ -112,11 +113,12 @@ class WAF implements API
 
         $user = $this->adapter->patch(
             'zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/rules/' . $ruleID,
+            [],
             $query
         );
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 
     public function getGroups(
@@ -144,11 +146,12 @@ class WAF implements API
 
         $user = $this->adapter->get(
             'zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/groups',
-            $query
+            $query,
+            []
         );
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function getGroupInfo(
@@ -156,10 +159,14 @@ class WAF implements API
         string $packageID,
         string $groupID
     ): \stdClass {
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/groups/' . $groupID);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get(
+            'zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/groups/' . $groupID,
+            [],
+            []
+        );
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 
     public function updateGroup(
@@ -174,10 +181,11 @@ class WAF implements API
 
         $user = $this->adapter->patch(
             'zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/groups/' . $groupID,
+            [],
             $query
         );
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        return $this->body->result;
+        return $body->result;
     }
 }

src/Endpoints/ZoneLockdown.php

@@ -9,12 +9,9 @@
 namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class ZoneLockdown implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -32,10 +29,10 @@ class ZoneLockdown implements API
             'per_page' => $perPage
         ];
 
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/lockdowns', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/lockdowns', $query, []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function createLockdown(
@@ -58,11 +55,11 @@ class ZoneLockdown implements API
             $options['description'] = $description;
         }
 
-        $user = $this->adapter->post('zones/' . $zoneID . '/firewall/lockdowns', $options);
+        $user = $this->adapter->post('zones/' . $zoneID . '/firewall/lockdowns', [], $options);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -71,9 +68,9 @@ class ZoneLockdown implements API
 
     public function getLockdownDetails(string $zoneID, string $lockdownID): \stdClass
     {
-        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/lockdowns/' . $lockdownID);
-        $this->body = json_decode($user->getBody());
-        return $this->body->result;
+        $user = $this->adapter->get('zones/' . $zoneID . '/firewall/lockdowns/' . $lockdownID, [], []);
+        $body = json_decode($user->getBody());
+        return $body->result;
     }
 
     public function updateLockdown(
@@ -93,11 +90,11 @@ class ZoneLockdown implements API
             $options['description'] = $description;
         }
 
-        $user = $this->adapter->put('zones/' . $zoneID . '/firewall/lockdowns/' . $lockdownID, $options);
+        $user = $this->adapter->put('zones/' . $zoneID . '/firewall/lockdowns/' . $lockdownID, [], $options);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
@@ -106,11 +103,11 @@ class ZoneLockdown implements API
 
     public function deleteLockdown(string $zoneID, string $lockdownID): bool
     {
-        $user = $this->adapter->delete('zones/' . $zoneID . '/firewall/lockdowns/' . $lockdownID);
+        $user = $this->adapter->delete('zones/' . $zoneID . '/firewall/lockdowns/' . $lockdownID, [], []);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 

src/Endpoints/ZoneSettings.php

@@ -1,180 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: paul.adams
- * Date: 2019-02-22
- * Time: 23:28
- */
-
-namespace Cloudflare\API\Endpoints;
-
-use Cloudflare\API\Adapter\Adapter;
-
-class ZoneSettings implements API
-{
-    private $adapter;
-
-    public function __construct(Adapter $adapter)
-    {
-        $this->adapter = $adapter;
-    }
-
-    public function getMinifySetting($zoneID)
-    {
-        $return = $this->adapter->get(
-            'zones/' . $zoneID . '/settings/minify'
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return $body->result->value;
-        }
-
-        return false;
-    }
-
-    public function getRocketLoaderSetting($zoneID)
-    {
-        $return = $this->adapter->get(
-            'zones/' . $zoneID . '/settings/rocket_loader'
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return $body->result->value;
-        }
-
-        return false;
-    }
-
-    public function getAlwaysOnlineSetting($zoneID)
-    {
-        $return = $this->adapter->get(
-            'zones/' . $zoneID . '/settings/always_online'
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return $body->result->value;
-        }
-
-        return false;
-    }
-
-    public function getEmailObfuscationSetting($zoneID)
-    {
-        $return = $this->adapter->get(
-            'zones/' . $zoneID . '/settings/email_obfuscation'
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return $body->result->value;
-        }
-
-        return false;
-    }
-
-    public function getHotlinkProtectionSetting($zoneID)
-    {
-        $return = $this->adapter->get(
-            'zones/' . $zoneID . '/settings/hotlink_protection'
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return $body->result->value;
-        }
-
-        return false;
-    }
-
-    public function updateMinifySetting($zoneID, $html, $css, $javascript)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/minify',
-            [
-                'value' => [
-                    'html' => $html,
-                    'css'  => $css,
-                    'js'   => $javascript,
-                ],
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function updateRocketLoaderSetting($zoneID, $value)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/rocket_loader',
-            [
-                'value' => $value,
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function updateAlwaysOnlineSetting($zoneID, $value)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/always_online',
-            [
-                'value' => $value,
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function updateEmailObfuscationSetting($zoneID, $value)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/email_obfuscation',
-            [
-                'value' => $value,
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function updateHotlinkProtectionSetting($zoneID, $value)
-    {
-        $return = $this->adapter->patch(
-            'zones/' . $zoneID . '/settings/hotlink_protection',
-            [
-                'value' => $value,
-            ]
-        );
-        $body   = json_decode($return->getBody());
-
-        if ($body->success) {
-            return true;
-        }
-
-        return false;
-    }
-}

src/Endpoints/Zones.php

@@ -9,12 +9,9 @@
 namespace Cloudflare\API\Endpoints;
 
 use Cloudflare\API\Adapter\Adapter;
-use Cloudflare\API\Traits\BodyAccessorTrait;
 
 class Zones implements API
 {
-    use BodyAccessorTrait;
-
     private $adapter;
 
     public function __construct(Adapter $adapter)
@@ -38,35 +35,26 @@ class Zones implements API
         ];
 
         if (!empty($organizationID)) {
-            $options['organization'] = ['id' => $organizationID];
+            $options['organization'] = (object)['id' => $organizationID];
         }
 
-        $user = $this->adapter->post('zones', $options);
-        $this->body = json_decode($user->getBody());
-        return $this->body->result;
+        $user = $this->adapter->post('zones', [], $options);
+        $body = json_decode($user->getBody());
+        return $body->result;
     }
 
     public function activationCheck(string $zoneID): bool
     {
-        $user = $this->adapter->put('zones/' . $zoneID . '/activation_check');
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->put('zones/' . $zoneID . '/activation_check', [], []);
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
         return false;
     }
 
-    public function getZoneById(
-        string $zoneId
-    ): \stdClass {
-        $user = $this->adapter->get('zones/' . $zoneId);
-        $this->body = json_decode($user->getBody());
-
-        return (object)['result' => $this->body->result];
-    }
-
     public function listZones(
         string $name = '',
         string $status = '',
@@ -98,10 +86,10 @@ class Zones implements API
             $query['direction'] = $direction;
         }
 
-        $user = $this->adapter->get('zones', $query);
-        $this->body = json_decode($user->getBody());
+        $user = $this->adapter->get('zones', $query, []);
+        $body = json_decode($user->getBody());
 
-        return (object)['result' => $this->body->result, 'result_info' => $this->body->result_info];
+        return (object)['result' => $body->result, 'result_info' => $body->result_info];
     }
 
     public function getZoneID(string $name = ''): string
@@ -126,11 +114,9 @@ class Zones implements API
      */
     public function getAnalyticsDashboard(string $zoneID, string $since = '-10080', string $until = '0', bool $continuous = true): \stdClass
     {
-        $response = $this->adapter->get('zones/' . $zoneID . '/analytics/dashboard', ['since' => $since, 'until' => $until, 'continuous' => var_export($continuous, true)]);
+        $response = $this->adapter->get('zones/' . $zoneID . '/analytics/dashboard', ['since' => $since, 'until' => $until, 'continuous' => var_export($continuous, true)], []);
 
-        $this->body = $response->getBody();
-
-        return json_decode($this->body)->result;
+        return json_decode($response->getBody())->result;
     }
 
     /**
@@ -142,49 +128,17 @@ class Zones implements API
      */
     public function changeDevelopmentMode(string $zoneID, bool $enable = false): bool
     {
-        $response = $this->adapter->patch('zones/' . $zoneID . '/settings/development_mode', ['value' => $enable ? 'on' : 'off']);
+        $response = $this->adapter->patch('zones/' . $zoneID . '/settings/development_mode', [], ['value' => $enable ? 'on' : 'off']);
 
-        $this->body = json_decode($response->getBody());
+        $body = json_decode($response->getBody());
 
-        if ($this->body->success) {
+        if ($body->success) {
             return true;
         }
 
         return false;
     }
 
-    /**
-     * Return caching level settings
-     * @param string $zoneID
-     * @return string
-     */
-    public function getCachingLevel(string $zoneID): string
-    {
-        $response = $this->adapter->get('zones/' . $zoneID . '/settings/cache_level');
-
-        $this->body = json_decode($response->getBody());
-
-        return $this->body->result->value;
-    }
-
-    /**
-     * Change caching level settings
-     * @param string $zoneID
-     * @param string $level (aggressive | basic | simplified)
-     * @return bool
-     */
-    public function setCachingLevel(string $zoneID, string $level = 'aggressive'): bool
-    {
-        $response = $this->adapter->patch('zones/' . $zoneID . '/settings/cache_level', ['value' => $level]);
-
-        $this->body = json_decode($response->getBody());
-
-        if ($this->body->success) {
-            return true;
-        }
-
-        return false;
-    }
 
     /**
      * Purge Everything
@@ -193,41 +147,33 @@ class Zones implements API
      */
     public function cachePurgeEverything(string $zoneID): bool
     {
-        $user = $this->adapter->delete('zones/' . $zoneID . '/purge_cache', ['purge_everything' => true]);
+        $user = $this->adapter->delete('zones/' . $zoneID . '/purge_cache', [], ['purge_everything' => true]);
 
-        $this->body = json_decode($user->getBody());
+        $body = json_decode($user->getBody());
 
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 
         return false;
     }
 
-    public function cachePurge(string $zoneID, array $files = null, array $tags = null, array $hosts = null): bool
+    public function cachePurge(string $zoneID, array $files = null, array $tags = null): bool
     {
-        if ($files === null && $tags === null && $hosts === null) {
-            throw new EndpointException('No files, tags or hosts to purge.');
+        if ($files === null && $tags === null) {
+            throw new EndpointException('No files or tags to purge.');
         }
 
-        $options = [];
-        if (!is_null($files)) {
-            $options['files'] = $files;
-        }
+        $options = [
+            'files' => $files,
+            'tags' => $tags
+        ];
 
-        if (!is_null($tags)) {
-            $options['tags'] = $tags;
-        }
+        $user = $this->adapter->delete('zones/' . $zoneID . '/purge_cache', [], $options);
 
-        if (!is_null($hosts)) {
-            $options['hosts'] = $hosts;
-        }
+        $body = json_decode($user->getBody());
 
-        $user = $this->adapter->delete('zones/' . $zoneID . '/purge_cache', $options);
-
-        $this->body = json_decode($user->getBody());
-
-        if (isset($this->body->result->id)) {
+        if (isset($body->result->id)) {
             return true;
         }
 

src/Traits/BodyAccessorTrait.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace Cloudflare\API\Traits;
-
-trait BodyAccessorTrait
-{
-    private $body;
-
-    public function getBody()
-    {
-        return $this->body;
-    }
-}

tests/Adapter/GuzzleTest.php

@@ -41,7 +41,7 @@ class GuzzleTest extends TestCase
 
     public function testPost()
     {
-        $response = $this->client->post('https://httpbin.org/post', ['X-Post-Test' => 'Testing a POST request.']);
+        $response = $this->client->post('https://httpbin.org/post', [], ['X-Post-Test' => 'Testing a POST request.']);
 
         $headers = $response->getHeaders();
         $this->assertEquals('application/json', $headers['Content-Type'][0]);
@@ -52,7 +52,7 @@ class GuzzleTest extends TestCase
 
     public function testPut()
     {
-        $response = $this->client->put('https://httpbin.org/put', ['X-Put-Test' => 'Testing a PUT request.']);
+        $response = $this->client->put('https://httpbin.org/put', [], ['X-Put-Test' => 'Testing a PUT request.']);
 
         $headers = $response->getHeaders();
         $this->assertEquals('application/json', $headers['Content-Type'][0]);
@@ -65,6 +65,7 @@ class GuzzleTest extends TestCase
     {
         $response = $this->client->patch(
             'https://httpbin.org/patch',
+            [],
             ['X-Patch-Test' => 'Testing a PATCH request.']
         );
 
@@ -79,6 +80,7 @@ class GuzzleTest extends TestCase
     {
         $response = $this->client->delete(
             'https://httpbin.org/delete',
+            [],
             ['X-Delete-Test' => 'Testing a DELETE request.']
         );
 

tests/Configurations/ConfigurationsUARulesTest.php

@@ -16,12 +16,12 @@ class ConfigurationsUARulesTest extends TestCase
         $array = $configuration->getArray();
         $this->assertCount(1, $array);
 
-        $this->assertArrayHasKey('target', $array[0]);
-        $this->assertEquals('ua', $array[0]['target']);
-        $this->assertArrayHasKey('value', $array[0]);
+        $this->assertObjectHasAttribute('target', $array[0]);
+        $this->assertEquals('ua', $array[0]->target);
+        $this->assertObjectHasAttribute('value', $array[0]);
         $this->assertEquals(
             'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_5) AppleWebKit/603.2.4 (KHTML, like Gecko) Version/10.1.1 Safari/603.2.4',
-            $array[0]['value']
+            $array[0]->value
         );
     }
 }

tests/Configurations/ConfigurationsZoneLockdownTest.php

@@ -16,19 +16,19 @@ class ConfigurationsZoneLockdownTest extends TestCase
         $array = $configuration->getArray();
         $this->assertCount(1, $array);
 
-        $this->assertArrayHasKey('target', $array[0]);
-        $this->assertEquals('ip', $array[0]['target']);
-        $this->assertArrayHasKey('value', $array[0]);
-        $this->assertEquals('1.2.3.4', $array[0]['value']);
+        $this->assertObjectHasAttribute('target', $array[0]);
+        $this->assertEquals('ip', $array[0]->target);
+        $this->assertObjectHasAttribute('value', $array[0]);
+        $this->assertEquals('1.2.3.4', $array[0]->value);
 
         $configuration->addIPRange('1.2.3.4/24');
 
         $array = $configuration->getArray();
         $this->assertCount(2, $array);
 
-        $this->assertArrayHasKey('target', $array[1]);
-        $this->assertEquals('ip_range', $array[1]['target']);
-        $this->assertArrayHasKey('value', $array[1]);
-        $this->assertEquals('1.2.3.4/24', $array[1]['value']);
+        $this->assertObjectHasAttribute('target', $array[1]);
+        $this->assertEquals('ip_range', $array[1]->target);
+        $this->assertObjectHasAttribute('value', $array[1]);
+        $this->assertEquals('1.2.3.4/24', $array[1]->value);
     }
 }

tests/Configurations/PageRulesActionTest.php

@@ -1,21 +0,0 @@
-<?php
-use Cloudflare\API\Configurations\PageRulesActions;
-
-class PageRulesActionTest extends TestCase
-{
-    public function testForwardingURLConfigurationIsApplied()
-    {
-        $identifier = 'forwarding_url';
-        $statusCode = 301;
-        $forwardingURL = 'https://www.example.org/';
-
-        $actions = new PageRulesActions();
-        $actions->setForwardingURL($statusCode, $forwardingURL);
-        $configuration = $actions->getArray();
-
-        $this->assertCount(1, $configuration);
-        $this->assertEquals($identifier, $configuration[0]['id']);
-        $this->assertEquals($statusCode, $configuration[0]['value']['status_code']);
-        $this->assertEquals($forwardingURL, $configuration[0]['value']['url']);
-    }
-}

tests/Configurations/PageRulesTargetTest.php

@@ -16,7 +16,7 @@ class PageRulesTargetTest extends TestCase
         $array = $targets->getArray();
 
         $this->assertCount(1, $array);
-        $this->assertEquals('junade.com/*', $array[0]['constraint']['value']);
-        $this->assertEquals('matches', $array[0]['constraint']['operator']);
+        $this->assertEquals('junade.com/*', $array[0]->constraint->value);
+        $this->assertEquals('matches', $array[0]->constraint->operator);
     }
 }

tests/Endpoints/AccessRulesTest.php

@@ -17,7 +17,8 @@ class AccessRulesTest extends TestCase
                     'page' => 1,
                     'per_page' => 50,
                     'match' => 'all'
-                ])
+                ]),
+                $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\AccessRules($mock);
@@ -28,7 +29,6 @@ class AccessRulesTest extends TestCase
 
         $this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $zones->getBody()->result[0]->id);
     }
 
     public function testCreateRule()
@@ -45,9 +45,10 @@ class AccessRulesTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'mode' => 'challenge',
-                    'configuration' => $config->getArray(),
+                    'configuration' => (object) $config->getArray(),
                     'notes' => 'This rule is on because of an event that occured on date X',
                 ])
             );
@@ -59,7 +60,6 @@ class AccessRulesTest extends TestCase
             $config,
             'This rule is on because of an event that occured on date X'
         );
-        $this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $rules->getBody()->result->id);
     }
 
     public function testUpdateRule()
@@ -73,6 +73,7 @@ class AccessRulesTest extends TestCase
             ->method('patch')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules/92f17202ed8bd63d69a66b86a49a8f6b'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'mode' => 'challenge',
                     'notes' => 'This rule is on because of an event that occured on date X',
@@ -86,7 +87,6 @@ class AccessRulesTest extends TestCase
             'challenge',
             'This rule is on because of an event that occured on date X'
         );
-        $this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $rules->getBody()->result->id);
     }
 
     public function testDeleteRule()
@@ -100,6 +100,7 @@ class AccessRulesTest extends TestCase
             ->method('delete')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules/92f17202ed8bd63d69a66b86a49a8f6b'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'cascade' => 'none'
                 ])
@@ -107,6 +108,5 @@ class AccessRulesTest extends TestCase
 
         $rules = new \Cloudflare\API\Endpoints\AccessRules($mock);
         $rules->deleteRule('023e105f4ecef8ad9ca31a8372d0c353', '92f17202ed8bd63d69a66b86a49a8f6b');
-        $this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $rules->getBody()->result->id);
     }
 }

tests/Endpoints/CustomHostnamesTest.php

@@ -1,138 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: junade
- * Date: 18/03/2018
- * Time: 22:23
- */
-
-use Cloudflare\API\Endpoints\CustomHostnames;
-
-class CustomHostnamesTest extends TestCase
-{
-    public function testAddHostname()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/createCustomHostname.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('post')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('post')
-            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames'),
-                $this->equalTo([
-                    'hostname' => 'app.example.com',
-                    'ssl' => [
-                        'method' => 'http',
-                        'type' => 'dv'
-                    ]
-                ])
-            );
-
-        $hostname = new CustomHostnames($mock);
-        $hostname->addHostname('023e105f4ecef8ad9ca31a8372d0c353', 'app.example.com', 'http', 'dv');
-        $this->assertEquals('0d89c70d-ad9f-4843-b99f-6cc0252067e9', $hostname->getBody()->result->id);
-    }
-
-    public function testListHostnames()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/listHostnames.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('get')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('get')
-            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames'),
-                $this->equalTo([
-                    'hostname' => 'app.example.com',
-                    'id' => '0d89c70d-ad9f-4843-b99f-6cc0252067e9',
-                    'page' => 1,
-                    'per_page' => 20,
-                    'order' => 'ssl',
-                    'direction' => 'desc',
-                    'ssl' => 0
-                ])
-            );
-
-        $zones = new \Cloudflare\API\Endpoints\CustomHostnames($mock);
-        $result = $zones->listHostnames('023e105f4ecef8ad9ca31a8372d0c353', 'app.example.com', '0d89c70d-ad9f-4843-b99f-6cc0252067e9', 1, 20, 'ssl', 'desc', 0);
-
-        $this->assertObjectHasAttribute('result', $result);
-        $this->assertObjectHasAttribute('result_info', $result);
-
-        $this->assertEquals('0d89c70d-ad9f-4843-b99f-6cc0252067e9', $result->result[0]->id);
-        $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('0d89c70d-ad9f-4843-b99f-6cc0252067e9', $zones->getBody()->result[0]->id);
-    }
-
-    public function testGetHostname()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/getHostname.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('get')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('get')
-            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9')
-            );
-
-        $zones = new \Cloudflare\API\Endpoints\CustomHostnames($mock);
-        $result = $zones->getHostname('023e105f4ecef8ad9ca31a8372d0c353', '0d89c70d-ad9f-4843-b99f-6cc0252067e9', '0d89c70d-ad9f-4843-b99f-6cc0252067e9');
-
-        $this->assertObjectHasAttribute('id', $result);
-        $this->assertObjectHasAttribute('hostname', $result);
-        $this->assertEquals('0d89c70d-ad9f-4843-b99f-6cc0252067e9', $zones->getBody()->result->id);
-    }
-
-    public function testUpdateHostname()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/updateHostname.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('patch')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('patch')
-            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9'),
-                $this->equalTo([
-                    'ssl' => [
-                        'method' => 'http',
-                        'type' =>  'dv'
-                    ]
-                ])
-            );
-
-        $zones = new \Cloudflare\API\Endpoints\CustomHostnames($mock);
-        $result = $zones->updateHostname('023e105f4ecef8ad9ca31a8372d0c353', '0d89c70d-ad9f-4843-b99f-6cc0252067e9', 'http', 'dv');
-
-        $this->assertObjectHasAttribute('id', $result);
-        $this->assertObjectHasAttribute('hostname', $result);
-        $this->assertEquals('0d89c70d-ad9f-4843-b99f-6cc0252067e9', $zones->getBody()->result->id);
-    }
-
-    public function testDeleteHostname()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteHostname.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('delete')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('delete')
-            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9')
-            );
-
-        $zones = new \Cloudflare\API\Endpoints\CustomHostnames($mock);
-        $result = $zones->deleteHostname('023e105f4ecef8ad9ca31a8372d0c353', '0d89c70d-ad9f-4843-b99f-6cc0252067e9');
-
-        $this->assertEquals('0d89c70d-ad9f-4843-b99f-6cc0252067e9', $result->id);
-        $this->assertEquals('0d89c70d-ad9f-4843-b99f-6cc0252067e9', $zones->getBody()->id);
-    }
-}

tests/Endpoints/DNSTest.php

@@ -19,6 +19,7 @@ class DNSTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'type' => 'A',
                     'name' => 'example.com',
@@ -43,16 +44,16 @@ class DNSTest extends TestCase
             ->method('get')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records'),
-                $this->equalTo([
-                    'page' => 1,
-                    'per_page' => 20,
-                    'match' => 'all',
-                    'type' => 'A',
-                    'name' => 'example.com',
-                    'content' => '127.0.0.1',
-                    'order' => 'type',
-                    'direction' => 'desc',
-                ])
+              $this->equalTo([
+                'page' => 1,
+                'per_page' => 20,
+                'match' => 'all',
+                'type' => 'A',
+                'name' => 'example.com',
+                'content' => '127.0.0.1',
+                'order' => 'type',
+                'direction' => 'desc']),
+              $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\DNS($mock);
@@ -63,7 +64,6 @@ class DNSTest extends TestCase
 
         $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $zones->getBody()->result[0]->id);
     }
 
     public function testGetDNSRecordDetails()
@@ -76,14 +76,14 @@ class DNSTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([])
             );
 
         $dns = new \Cloudflare\API\Endpoints\DNS($mock);
         $result = $dns->getRecordDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
 
         $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->id);
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $dns->getBody()->result->id);
     }
 
     public function testUpdateDNSRecord()
@@ -105,6 +105,7 @@ class DNSTest extends TestCase
             ->method('put')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([]),
                 $this->equalTo($details)
             );
 
@@ -112,7 +113,6 @@ class DNSTest extends TestCase
         $result = $dns->updateRecordDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59', $details);
 
         $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result->id);
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $dns->getBody()->result->id);
 
         foreach ($details as $property => $value) {
             $this->assertEquals($result->result->{ $property }, $value);

tests/Endpoints/IPsTest.php

@@ -18,14 +18,13 @@ class IPsTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('ips')
+                $this->equalTo('ips'),
+                $this->equalTo([])
             );
 
-        $ipsMock = new \Cloudflare\API\Endpoints\IPs($mock);
-        $ips = $ipsMock->listIPs();
+        $ips = new \Cloudflare\API\Endpoints\IPs($mock);
+        $ips = $ips->listIPs();
         $this->assertObjectHasAttribute('ipv4_cidrs', $ips);
         $this->assertObjectHasAttribute('ipv6_cidrs', $ips);
-        $this->assertObjectHasAttribute('ipv4_cidrs', $ipsMock->getBody()->result);
-        $this->assertObjectHasAttribute('ipv6_cidrs', $ipsMock->getBody()->result);
     }
 }

tests/Endpoints/MembershipTest.php

@@ -1,93 +0,0 @@
-<?php
-
-
-class MembershipTest extends TestCase
-{
-    public function testListMemberships()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/listMemberships.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('get')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('get')
-            ->with(
-                $this->equalTo('memberships'),
-                $this->equalTo([
-                    'page' => 1,
-                    'per_page' => 20,
-                    'account.name' => 'Demo Account',
-                    'status' => 'accepted',
-                    'order' => 'status',
-                    'direction' => 'desc',
-                ])
-            );
-
-        $zones = new \Cloudflare\API\Endpoints\Membership($mock);
-        $result = $zones->listMemberships('Demo Account', 'accepted', 1, 20, 'status', 'desc');
-
-        $this->assertObjectHasAttribute('result', $result);
-        $this->assertObjectHasAttribute('result_info', $result);
-
-        $this->assertEquals('4536bcfad5faccb111b47003c79917fa', $result->result[0]->id);
-        $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('4536bcfad5faccb111b47003c79917fa', $zones->getBody()->result[0]->id);
-    }
-
-    public function testGetMembershipDetails()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/getMembershipDetails.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('get')->willReturn($response);
-
-        $membership = new \Cloudflare\API\Endpoints\Membership($mock);
-        $details = $membership->getMembershipDetails('4536bcfad5faccb111b47003c79917fa');
-
-        $this->assertObjectHasAttribute('id', $details);
-        $this->assertEquals('4536bcfad5faccb111b47003c79917fa', $details->id);
-        $this->assertObjectHasAttribute('code', $details);
-        $this->assertEquals('05dd05cce12bbed97c0d87cd78e89bc2fd41a6cee72f27f6fc84af2e45c0fac0', $details->code);
-        $this->assertEquals('4536bcfad5faccb111b47003c79917fa', $membership->getBody()->result->id);
-    }
-
-    public function testUpdateMembershipDetails()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/updateMembershipStatus.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('put')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('put')
-            ->with(
-                $this->equalTo('memberships/4536bcfad5faccb111b47003c79917fa'),
-                $this->equalTo([
-                    'status' => 'accepted'
-                ])
-            );
-
-        $membership = new \Cloudflare\API\Endpoints\Membership($mock);
-        $membership->updateMembershipStatus('4536bcfad5faccb111b47003c79917fa', 'accepted');
-        $this->assertEquals('4536bcfad5faccb111b47003c79917fa', $membership->getBody()->result->id);
-    }
-
-    public function testDeleteMembership()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/deleteMembership.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('delete')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('delete')
-            ->with($this->equalTo('memberships/4536bcfad5faccb111b47003c79917fa'));
-
-        $membership = new \Cloudflare\API\Endpoints\Membership($mock);
-
-        $membership->deleteMembership('4536bcfad5faccb111b47003c79917fa');
-
-        $this->assertEquals('4536bcfad5faccb111b47003c79917fa', $membership->getBody()->result->id);
-    }
-}

tests/Endpoints/PageRulesTest.php

@@ -23,6 +23,7 @@ class PageRulesTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'targets' => $target->getArray(),
                     'actions' => $action->getArray(),
@@ -35,7 +36,6 @@ class PageRulesTest extends TestCase
         $result = $pageRules->createPageRule('023e105f4ecef8ad9ca31a8372d0c353', $target, $action, true, 1);
 
         $this->assertTrue($result);
-        $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $pageRules->getBody()->result->id);
     }
 
     public function testListPageRules()
@@ -54,12 +54,12 @@ class PageRulesTest extends TestCase
                 'order' => 'status',
                 'direction' => 'desc',
                 'match' => 'all'
-              ])
+              ]),
+              $this->equalTo([])
             );
 
         $pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
         $pageRules->listPageRules('023e105f4ecef8ad9ca31a8372d0c353', 'active', 'status', 'desc', 'all');
-        $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $pageRules->getBody()->result[0]->id);
     }
 
     public function testGetPageRuleDetails()
@@ -72,12 +72,12 @@ class PageRulesTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac'),
+                $this->equalTo([])
             );
 
         $pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
         $pageRules->getPageRuleDetails('023e105f4ecef8ad9ca31a8372d0c353', '9a7806061c88ada191ed06f989cc3dac');
-        $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $pageRules->getBody()->result->id);
     }
 
     public function testUpdatePageRule()
@@ -95,6 +95,7 @@ class PageRulesTest extends TestCase
             ->method('patch')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'targets' => $target->getArray(),
                     'actions' => $action->getArray(),
@@ -107,7 +108,6 @@ class PageRulesTest extends TestCase
         $result = $pageRules->updatePageRule('023e105f4ecef8ad9ca31a8372d0c353', $target, $action, true, 1);
 
         $this->assertTrue($result);
-        $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $pageRules->getBody()->result->id);
     }
 
     public function testDeletePageRule()
@@ -120,13 +120,14 @@ class PageRulesTest extends TestCase
         $mock->expects($this->once())
             ->method('delete')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac'),
+                $this->equalTo([]),
+                $this->equalTo([])
             );
 
         $pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
         $result = $pageRules->deletePageRule('023e105f4ecef8ad9ca31a8372d0c353', '9a7806061c88ada191ed06f989cc3dac');
 
         $this->assertTrue($result);
-        $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $pageRules->getBody()->result->id);
     }
 }

tests/Endpoints/RailgunTest.php

@@ -23,6 +23,7 @@ class RailgunTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('railguns'),
+                $this->equalTo([]),
                 $this->equalTo(['name' => $details['name']])
             );
 
@@ -34,7 +35,6 @@ class RailgunTest extends TestCase
         foreach ($details as $property => $value) {
             $this->assertEquals($result->result->{ $property }, $value);
         }
-        $this->assertEquals('e928d310693a83094309acf9ead50448', $railgun->getBody()->result->id);
     }
 
     public function testlist()
@@ -52,7 +52,8 @@ class RailgunTest extends TestCase
                     'page' => 1,
                     'per_page' => 20,
                     'direction' => 'desc'
-                ])
+                ]),
+                $this->equalTo([])
             );
 
         $railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
@@ -60,7 +61,6 @@ class RailgunTest extends TestCase
 
         $this->assertObjectHasAttribute('result', $result);
         $this->assertObjectHasAttribute('result_info', $result);
-        $this->assertEquals('e928d310693a83094309acf9ead50448', $railgun->getBody()->result[0]->id);
     }
 
     public function testget()
@@ -73,14 +73,14 @@ class RailgunTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('railguns/e928d310693a83094309acf9ead50448')
+                $this->equalTo('railguns/e928d310693a83094309acf9ead50448'),
+                $this->equalTo([])
             );
 
         $railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
         $result = $railgun->get('e928d310693a83094309acf9ead50448');
 
         $this->assertEquals('e928d310693a83094309acf9ead50448', $result->id);
-        $this->assertEquals('e928d310693a83094309acf9ead50448', $railgun->getBody()->result->id);
     }
 
     public function testgetZones()
@@ -93,7 +93,9 @@ class RailgunTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('railguns/e928d310693a83094309acf9ead50448/zones')
+                $this->equalTo('railguns/e928d310693a83094309acf9ead50448/zones'),
+                $this->equalTo([]),
+                $this->equalTo([])
             );
 
         $railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
@@ -101,7 +103,6 @@ class RailgunTest extends TestCase
 
         $this->assertObjectHasAttribute('result', $result);
         $this->assertObjectHasAttribute('result_info', $result);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $railgun->getBody()->result[0]->id);
     }
 
     public function testupdate()
@@ -119,6 +120,7 @@ class RailgunTest extends TestCase
             ->method('patch')
             ->with(
                 $this->equalTo('railguns/e928d310693a83094309acf9ead50448'),
+                $this->equalTo([]),
                 $this->equalTo($details)
             );
 
@@ -126,7 +128,6 @@ class RailgunTest extends TestCase
         $result = $waf->update('e928d310693a83094309acf9ead50448', true);
 
         $this->assertEquals('e928d310693a83094309acf9ead50448', $result->id);
-        $this->assertEquals('e928d310693a83094309acf9ead50448', $waf->getBody()->result->id);
     }
 
     public function testdelete()
@@ -139,11 +140,12 @@ class RailgunTest extends TestCase
         $mock->expects($this->once())
             ->method('delete')
             ->with(
-                $this->equalTo('railguns/e928d310693a83094309acf9ead50448')
+                $this->equalTo('railguns/e928d310693a83094309acf9ead50448'),
+                $this->equalTo([]),
+                $this->equalTo([])
             );
 
         $waf = new \Cloudflare\API\Endpoints\Railgun($mock);
         $waf->delete('e928d310693a83094309acf9ead50448');
-        $this->assertEquals('e928d310693a83094309acf9ead50448', $waf->getBody()->result->id);
     }
 }

tests/Endpoints/TLSTest.php

@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Created by PhpStorm.
- * User: Jurgen Coetsiers
- * Date: 21/10/2018
- * Time: 09:09
- */
-
-class TLSTest extends TestCase
-{
-    public function testEnableTLS13()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/enableTLS13.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('patch')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('patch')
-            ->with(
-                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/settings/tls_1_3'),
-                $this->equalTo(['value' => 'on'])
-            );
-
-        $zoneTLSSettings = new \Cloudflare\API\Endpoints\TLS($mock);
-        $result = $zoneTLSSettings->enableTLS13('c2547eb745079dac9320b638f5e225cf483cc5cfdda41', true);
-
-        $this->assertTrue($result);
-    }
-
-    public function testDisableTLS13()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/disableTLS13.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('patch')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('patch')
-            ->with(
-                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/settings/tls_1_3'),
-                $this->equalTo(['value' => 'off'])
-            );
-
-        $zoneTLSSettings = new \Cloudflare\API\Endpoints\TLS($mock);
-        $result = $zoneTLSSettings->disableTLS13('c2547eb745079dac9320b638f5e225cf483cc5cfdda41', true);
-
-        $this->assertTrue($result);
-    }
-
-    public function testChangeMinimimTLSVersion()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/changeMinimumTLSVersion.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('patch')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('patch')
-            ->with(
-                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/settings/min_tls_version'),
-                $this->equalTo(['value' => '1.1'])
-            );
-
-        $zoneTLSSettings = new \Cloudflare\API\Endpoints\TLS($mock);
-        $result = $zoneTLSSettings->changeMinimumTLSVersion('c2547eb745079dac9320b638f5e225cf483cc5cfdda41', '1.1');
-
-        $this->assertTrue($result);
-    }
-}

tests/Endpoints/UARulesTest.php

@@ -22,7 +22,8 @@ class UARulesTest extends TestCase
               $this->equalTo([
                 'page' => 1,
                 'per_page' => 20
-              ])
+              ]),
+              $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\UARules($mock);
@@ -33,7 +34,6 @@ class UARulesTest extends TestCase
 
         $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $zones->getBody()->result[0]->id);
     }
 
     public function testCreateRule()
@@ -50,6 +50,7 @@ class UARulesTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'mode' => 'js_challenge',
                     'id' => '372e67954025e0ba6aaa6d586b9e0b59',
@@ -66,7 +67,6 @@ class UARulesTest extends TestCase
             '372e67954025e0ba6aaa6d586b9e0b59',
             'Prevent access from abusive clients identified by this UserAgent to mitigate DDoS attack'
         );
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $rules->getBody()->result->id);
     }
 
     public function getRuleDetails()
@@ -79,14 +79,14 @@ class UARulesTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([])
             );
 
         $lockdown = new \Cloudflare\API\Endpoints\UARules($mock);
         $result = $lockdown->getRuleDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
 
         $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->id);
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $lockdown->getBody()->result->id);
     }
 
     public function testUpdateRule()
@@ -103,6 +103,7 @@ class UARulesTest extends TestCase
             ->method('put')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'mode' => 'js_challenge',
                     'id' => '372e67954025e0ba6aaa6d586b9e0b59',
@@ -119,7 +120,6 @@ class UARulesTest extends TestCase
             $config,
             'Restrict access to these endpoints to requests from a known IP address'
         );
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $rules->getBody()->result->id);
     }
 
     public function testDeleteRule()
@@ -132,11 +132,12 @@ class UARulesTest extends TestCase
         $mock->expects($this->once())
             ->method('delete')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([]),
+                $this->equalTo([])
             );
 
         $rules = new \Cloudflare\API\Endpoints\UARules($mock);
         $rules->deleteRule('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $rules->getBody()->result->id);
     }
 }

tests/Endpoints/UserTest.php

@@ -21,7 +21,6 @@ class UserTest extends TestCase
         $this->assertEquals('7c5dae5552338874e5053f2534d2767a', $details->id);
         $this->assertObjectHasAttribute('email', $details);
         $this->assertEquals('user@example.com', $details->email);
-        $this->assertEquals('7c5dae5552338874e5053f2534d2767a', $user->getBody()->result->id);
     }
 
     public function testGetUserID()
@@ -33,7 +32,6 @@ class UserTest extends TestCase
 
         $user = new \Cloudflare\API\Endpoints\User($mock);
         $this->assertEquals('7c5dae5552338874e5053f2534d2767a', $user->getUserID());
-        $this->assertEquals('7c5dae5552338874e5053f2534d2767a', $user->getBody()->result->id);
     }
 
     public function testGetUserEmail()
@@ -47,7 +45,6 @@ class UserTest extends TestCase
 
         $user = new \Cloudflare\API\Endpoints\User($mock);
         $this->assertEquals('user@example.com', $user->getUserEmail());
-        $this->assertEquals('user@example.com', $user->getBody()->result->email);
     }
 
     public function testUpdateUserDetails()
@@ -59,10 +56,9 @@ class UserTest extends TestCase
 
         $mock->expects($this->once())
             ->method('patch')
-            ->with($this->equalTo('user'), $this->equalTo(['email' => 'user2@example.com']));
+            ->with($this->equalTo('user'), $this->equalTo([]), $this->equalTo(['email' => 'user2@example.com']));
 
         $user = new \Cloudflare\API\Endpoints\User($mock);
         $user->updateUserDetails(['email' => 'user2@example.com']);
-        $this->assertEquals('7c5dae5552338874e5053f2534d2767a', $user->getBody()->result->id);
     }
 }

tests/Endpoints/WAFTest.php

@@ -25,7 +25,8 @@ class WAFTest extends TestCase
                     'match' => 'all',
                     'order' => 'status',
                     'direction' => 'desc'
-                ])
+                ]),
+                $this->equalTo([])
             );
 
         $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -36,7 +37,6 @@ class WAFTest extends TestCase
 
         $this->assertEquals('a25a9a7e9c00afc1fb2e0245519d725b', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('a25a9a7e9c00afc1fb2e0245519d725b', $waf->getBody()->result[0]->id);
     }
 
     public function testgetPackageInfo()
@@ -49,14 +49,14 @@ class WAFTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b'),
+                $this->equalTo([])
             );
 
         $waf = new \Cloudflare\API\Endpoints\WAF($mock);
         $result = $waf->getPackageInfo('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b');
 
         $this->assertEquals('a25a9a7e9c00afc1fb2e0245519d725b', $result->id);
-        $this->assertEquals('a25a9a7e9c00afc1fb2e0245519d725b', $waf->getBody()->result->id);
     }
 
     public function testgetRules()
@@ -76,7 +76,8 @@ class WAFTest extends TestCase
                     'match' => 'all',
                     'order' => 'status',
                     'direction' => 'desc'
-                ])
+                ]),
+                $this->equalTo([])
             );
 
         $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -87,7 +88,6 @@ class WAFTest extends TestCase
 
         $this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('92f17202ed8bd63d69a66b86a49a8f6b', $waf->getBody()->result[0]->id);
     }
 
     public function testgetRuleInfo()
@@ -100,14 +100,14 @@ class WAFTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/rules/f939de3be84e66e757adcdcb87908023')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/rules/f939de3be84e66e757adcdcb87908023'),
+                $this->equalTo([])
             );
 
         $waf = new \Cloudflare\API\Endpoints\WAF($mock);
         $result = $waf->getRuleInfo('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 'f939de3be84e66e757adcdcb87908023');
 
         $this->assertEquals('f939de3be84e66e757adcdcb87908023', $result->id);
-        $this->assertEquals('f939de3be84e66e757adcdcb87908023', $waf->getBody()->result->id);
     }
 
     public function testupdateRule()
@@ -125,6 +125,7 @@ class WAFTest extends TestCase
             ->method('patch')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/rules/f939de3be84e66e757adcdcb87908023'),
+                $this->equalTo([]),
                 $this->equalTo($details)
             );
 
@@ -136,7 +137,6 @@ class WAFTest extends TestCase
         foreach ($details as $property => $value) {
             $this->assertEquals($result->{ $property }, $value);
         }
-        $this->assertEquals('f939de3be84e66e757adcdcb87908023', $waf->getBody()->result->id);
     }
 
     public function getGroups()
@@ -156,7 +156,8 @@ class WAFTest extends TestCase
                     'match' => 'all',
                     'order' => 'status',
                     'direction' => 'desc'
-                ])
+                ]),
+                $this->equalTo([])
             );
 
         $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -167,7 +168,6 @@ class WAFTest extends TestCase
 
         $this->assertEquals('de677e5818985db1285d0e80225f06e5', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('de677e5818985db1285d0e80225f06e5', $waf->getBody()->result[0]->id);
     }
 
     public function testgetGroupInfo()
@@ -180,14 +180,14 @@ class WAFTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/groups/de677e5818985db1285d0e80225f06e5')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/groups/de677e5818985db1285d0e80225f06e5'),
+                $this->equalTo([])
             );
 
         $waf = new \Cloudflare\API\Endpoints\WAF($mock);
         $result = $waf->getGroupInfo('023e105f4ecef8ad9ca31a8372d0c353', 'a25a9a7e9c00afc1fb2e0245519d725b', 'de677e5818985db1285d0e80225f06e5');
 
         $this->assertEquals('de677e5818985db1285d0e80225f06e5', $result->id);
-        $this->assertEquals('de677e5818985db1285d0e80225f06e5', $waf->getBody()->result->id);
     }
 
     public function testupdateGroup()
@@ -205,6 +205,7 @@ class WAFTest extends TestCase
             ->method('patch')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/groups/de677e5818985db1285d0e80225f06e5'),
+                $this->equalTo([]),
                 $this->equalTo($details)
             );
 
@@ -216,6 +217,5 @@ class WAFTest extends TestCase
         foreach ($details as $property => $value) {
             $this->assertEquals($result->{ $property }, $value);
         }
-        $this->assertEquals('de677e5818985db1285d0e80225f06e5', $waf->getBody()->result->id);
     }
 }

tests/Endpoints/ZoneLockdownTest.php

@@ -19,10 +19,11 @@ class ZoneLockdownTest extends TestCase
             ->method('get')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns'),
-                $this->equalTo([
-                    'page' => 1,
-                    'per_page' => 20,
-                ])
+              $this->equalTo([
+                'page' => 1,
+                'per_page' => 20,
+              ]),
+              $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
@@ -33,7 +34,6 @@ class ZoneLockdownTest extends TestCase
 
         $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $zones->getBody()->result[0]->id);
     }
 
     public function testAddLockdown()
@@ -50,6 +50,7 @@ class ZoneLockdownTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'urls' => ['api.mysite.com/some/endpoint*'],
                     'id' => '372e67954025e0ba6aaa6d586b9e0b59',
@@ -66,7 +67,6 @@ class ZoneLockdownTest extends TestCase
             '372e67954025e0ba6aaa6d586b9e0b59',
             'Restrict access to these endpoints to requests from a known IP address'
         );
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $zoneLockdown->getBody()->result->id);
     }
 
     public function testGetRecordDetails()
@@ -79,14 +79,14 @@ class ZoneLockdownTest extends TestCase
         $mock->expects($this->once())
             ->method('get')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([])
             );
 
         $lockdown = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
         $result = $lockdown->getLockdownDetails('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
 
         $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $result->id);
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $lockdown->getBody()->result->id);
     }
 
     public function testUpdateLockdown()
@@ -103,6 +103,7 @@ class ZoneLockdownTest extends TestCase
             ->method('put')
             ->with(
                 $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'urls' => ['api.mysite.com/some/endpoint*'],
                     'id' => '372e67954025e0ba6aaa6d586b9e0b59',
@@ -119,7 +120,6 @@ class ZoneLockdownTest extends TestCase
             $config,
             'Restrict access to these endpoints to requests from a known IP address'
         );
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $zoneLockdown->getBody()->result->id);
     }
 
     public function testDeleteLockdown()
@@ -135,11 +135,12 @@ class ZoneLockdownTest extends TestCase
         $mock->expects($this->once())
             ->method('delete')
             ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59')
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59'),
+                $this->equalTo([]),
+                $this->equalTo([])
             );
 
         $zoneLockdown = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
         $zoneLockdown->deleteLockdown('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59');
-        $this->assertEquals('372e67954025e0ba6aaa6d586b9e0b59', $zoneLockdown->getBody()->result->id);
     }
 }

tests/Endpoints/ZonesTest.php

@@ -19,6 +19,7 @@ class ZonesTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('zones'),
+                $this->equalTo([]),
                 $this->equalTo(['name' => 'example.com', 'jump_start' => false])
             );
 
@@ -37,16 +38,16 @@ class ZonesTest extends TestCase
             ->method('post')
             ->with(
                 $this->equalTo('zones'),
+                $this->equalTo([]),
                 $this->equalTo([
                     'name' => 'example.com',
                     'jump_start' => true,
-                    'organization' => ['id' => '01a7362d577a6c3019a474fd6f485823']
+                    'organization' => (object)['id' => '01a7362d577a6c3019a474fd6f485823']
                 ])
             );
 
         $zones = new \Cloudflare\API\Endpoints\Zones($mock);
         $zones->addZone('example.com', true, '01a7362d577a6c3019a474fd6f485823');
-        $this->assertEquals('9a7806061c88ada191ed06f989cc3dac', $zones->getBody()->result->id);
     }
 
     public function testActivationTest()
@@ -59,14 +60,15 @@ class ZonesTest extends TestCase
         $mock->expects($this->once())
             ->method('put')
             ->with(
-                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/activation_check')
+                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/activation_check'),
+                $this->equalTo([]),
+                $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\Zones($mock);
         $result = $zones->activationCheck('c2547eb745079dac9320b638f5e225cf483cc5cfdda41');
 
         $this->assertTrue($result);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id);
     }
 
     public function testListZones()
@@ -80,15 +82,16 @@ class ZonesTest extends TestCase
             ->method('get')
             ->with(
                 $this->equalTo('zones'),
-                $this->equalTo([
-                    'page' => 1,
-                    'per_page' => 20,
-                    'match' => 'all',
-                    'name' => 'example.com',
-                    'status' => 'active',
-                    'order' => 'status',
-                    'direction' => 'desc',
-                ])
+              $this->equalTo([
+                'page' => 1,
+                'per_page' => 20,
+                'match' => 'all',
+                'name' => 'example.com',
+                'status' => 'active',
+                'order' => 'status',
+                'direction' => 'desc'
+              ]),
+                $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\Zones($mock);
@@ -99,26 +102,6 @@ class ZonesTest extends TestCase
 
         $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $result->result[0]->id);
         $this->assertEquals(1, $result->result_info->page);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result[0]->id);
-    }
-
-    public function testGetZoneByID()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/getZoneById.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('get')->willReturn($response);
-
-        $mock->expects($this->once())
-             ->method('get')
-             ->with($this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353'));
-
-        $zones = new \Cloudflare\API\Endpoints\Zones($mock);
-        $result = $zones->getZoneById('023e105f4ecef8ad9ca31a8372d0c353');
-
-        $this->assertInstanceOf(\stdClass::class, $result);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id);
-        $this->assertEquals('example.com', $zones->getBody()->result->name);
     }
 
     public function testGetZoneID()
@@ -132,19 +115,19 @@ class ZonesTest extends TestCase
             ->method('get')
             ->with(
                 $this->equalTo('zones'),
-                $this->equalTo([
-                    'page' => 1,
-                    'per_page' => 20,
-                    'match' => 'all',
-                    'name' => 'example.com',
-                ])
+              $this->equalTo([
+                'page' => 1,
+                'per_page' => 20,
+                'match' => 'all',
+                'name' => 'example.com',
+                ]),
+              $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\Zones($mock);
         $result = $zones->getZoneID('example.com');
 
         $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $result);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result[0]->id);
     }
 
     public function testGetAnalyticsDashboard()
@@ -158,7 +141,8 @@ class ZonesTest extends TestCase
             ->method('get')
             ->with(
                 $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/analytics/dashboard'),
-                $this->equalTo(['since' => '-10080', 'until' => '0', 'continuous' => var_export(true, true)])
+                $this->equalTo(['since' => '-10080', 'until' => '0', 'continuous' => var_export(true, true)]),
+                $this->equalTo([])
             );
 
         $zones = new \Cloudflare\API\Endpoints\Zones($mock);
@@ -167,7 +151,7 @@ class ZonesTest extends TestCase
         $this->assertObjectHasAttribute('since', $analytics->totals);
         $this->assertObjectHasAttribute('since', $analytics->timeseries[0]);
     }
-
+    
     public function testChangeDevelopmentMode()
     {
         $response = $this->getPsr7JsonResponseForFixture('Endpoints/changeDevelopmentMode.json');
@@ -179,6 +163,7 @@ class ZonesTest extends TestCase
             ->method('patch')
             ->with(
                 $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/settings/development_mode'),
+                $this->equalTo([]),
                 $this->equalTo(['value' => 'on'])
             );
 
@@ -186,7 +171,6 @@ class ZonesTest extends TestCase
         $result = $zones->changeDevelopmentMode('c2547eb745079dac9320b638f5e225cf483cc5cfdda41', true);
 
         $this->assertTrue($result);
-        $this->assertEquals('development_mode', $zones->getBody()->result->id);
     }
 
     public function testCachePurgeEverything()
@@ -200,6 +184,7 @@ class ZonesTest extends TestCase
             ->method('delete')
             ->with(
                 $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/purge_cache'),
+                $this->equalTo([]),
                 $this->equalTo(['purge_everything' => true])
             );
 
@@ -207,59 +192,5 @@ class ZonesTest extends TestCase
         $result = $zones->cachePurgeEverything('c2547eb745079dac9320b638f5e225cf483cc5cfdda41');
 
         $this->assertTrue($result);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id);
-    }
-
-    public function testCachePurgeHost()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/cachePurgeHost.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('delete')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('delete')
-            ->with(
-                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/purge_cache'),
-                $this->equalTo(
-                    [
-                        'files' => [],
-                        'tags' => [],
-                        'hosts' => ['dash.cloudflare.com']
-                    ]
-                )
-            );
-
-        $zones = new \Cloudflare\API\Endpoints\Zones($mock);
-        $result = $zones->cachePurge('c2547eb745079dac9320b638f5e225cf483cc5cfdda41', [], [], ['dash.cloudflare.com']);
-
-        $this->assertTrue($result);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id);
-    }
-
-    public function testCachePurge()
-    {
-        $response = $this->getPsr7JsonResponseForFixture('Endpoints/cachePurge.json');
-
-        $mock = $this->getMockBuilder(\Cloudflare\API\Adapter\Adapter::class)->getMock();
-        $mock->method('delete')->willReturn($response);
-
-        $mock->expects($this->once())
-            ->method('delete')
-            ->with(
-                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/purge_cache'),
-                $this->equalTo(['files' => [
-                    'https://example.com/file.jpg',
-                    ]
-                ])
-            );
-
-        $zones = new \Cloudflare\API\Endpoints\Zones($mock);
-        $result = $zones->cachePurge('c2547eb745079dac9320b638f5e225cf483cc5cfdda41', [
-            'https://example.com/file.jpg',
-        ]);
-
-        $this->assertTrue($result);
-        $this->assertEquals('023e105f4ecef8ad9ca31a8372d0c353', $zones->getBody()->result->id);
     }
 }

tests/Fixtures/Endpoints/cachePurge.json

@@ -1,8 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": {
-    "id": "023e105f4ecef8ad9ca31a8372d0c353"
-  }
-}

tests/Fixtures/Endpoints/cachePurgeHost.json

@@ -1,8 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": {
-    "id": "023e105f4ecef8ad9ca31a8372d0c353"
-  }
-}

tests/Fixtures/Endpoints/changeMinimumTLSVersion.json

@@ -1,6 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": "1.1"
-}

tests/Fixtures/Endpoints/createCustomHostname.json

@@ -1,20 +0,0 @@
-{
-  "success": true,
-  "errors": [
-    {}
-  ],
-  "messages": [
-    {}
-  ],
-  "result": {
-    "id": "0d89c70d-ad9f-4843-b99f-6cc0252067e9",
-    "hostname": "app.example.com",
-    "ssl": {
-      "status": "pending_validation",
-      "method": "http",
-      "type": "dv",
-      "cname_target": "dcv.digicert.com",
-      "cname": "810b7d5f01154524b961ba0cd578acc2.app.example.com"
-    }
-  }
-}

tests/Fixtures/Endpoints/deleteHostname.json

@@ -1,3 +0,0 @@
-{
-  "id": "0d89c70d-ad9f-4843-b99f-6cc0252067e9"
-}

tests/Fixtures/Endpoints/deleteMembership.json

@@ -1,8 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": {
-    "id": "4536bcfad5faccb111b47003c79917fa"
-  }
-}

tests/Fixtures/Endpoints/disableTLS13.json

@@ -1,6 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": "off"
-}

tests/Fixtures/Endpoints/enableTLS13.json

@@ -1,6 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": "on"
-}

tests/Fixtures/Endpoints/getHostname.json

@@ -1,20 +0,0 @@
-{
-  "success": true,
-  "errors": [
-    {}
-  ],
-  "messages": [
-    {}
-  ],
-  "result": {
-    "id": "0d89c70d-ad9f-4843-b99f-6cc0252067e9",
-    "hostname": "app.example.com",
-    "ssl": {
-      "status": "pending_validation",
-      "method": "http",
-      "type": "dv",
-      "cname_target": "dcv.digicert.com",
-      "cname": "810b7d5f01154524b961ba0cd578acc2.app.example.com"
-    }
-  }
-}

tests/Fixtures/Endpoints/getMembershipDetails.json

@@ -1,70 +0,0 @@
-{
-    "success": true,
-    "errors": [],
-    "messages": [],
-    "result": {
-    "id": "4536bcfad5faccb111b47003c79917fa",
-        "code": "05dd05cce12bbed97c0d87cd78e89bc2fd41a6cee72f27f6fc84af2e45c0fac0",
-        "status": "accepted",
-        "account": {
-        "id": "01a7362d577a6c3019a474fd6f485823",
-            "name": "Demo Account",
-            "settings": {
-            "enforce_twofactor": false
-        }
-    },
-    "roles": [
-        "Account Administrator"
-    ],
-        "permissions": {
-        "analytics": {
-            "read": true,
-                "write": true
-        },
-        "billing": {
-            "read": true,
-                "write": true
-        },
-        "cache_purge": {
-            "read": true,
-                "write": true
-        },
-        "dns": {
-            "read": true,
-                "write": true
-        },
-        "dns_records": {
-            "read": true,
-                "write": true
-        },
-        "lb": {
-            "read": true,
-                "write": true
-        },
-        "logs": {
-            "read": true,
-                "write": true
-        },
-        "organization": {
-            "read": true,
-                "write": true
-        },
-        "ssl": {
-            "read": true,
-                "write": true
-        },
-        "waf": {
-            "read": true,
-                "write": true
-        },
-        "zones": {
-            "read": true,
-                "write": true
-        },
-        "zone_settings": {
-            "read": true,
-                "write": true
-        }
-    }
-}
-}

tests/Fixtures/Endpoints/getZoneById.json

@@ -1,59 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": {
-    "id": "023e105f4ecef8ad9ca31a8372d0c353",
-    "name": "example.com",
-    "development_mode": 7200,
-    "original_name_servers": [
-      "ns1.originaldnshost.com",
-      "ns2.originaldnshost.com"
-    ],
-    "original_registrar": "GoDaddy",
-    "original_dnshost": "NameCheap",
-    "created_on": "2014-01-01T05:20:00.12345Z",
-    "modified_on": "2014-01-01T05:20:00.12345Z",
-    "activated_on": "2014-01-02T00:01:00.12345Z",
-    "owner": {
-      "id": "7c5dae5552338874e5053f2534d2767a",
-      "email": "user@example.com",
-      "type": "user"
-    },
-    "account": {
-      "id": "01a7362d577a6c3019a474fd6f485823",
-      "name": "Demo Account"
-    },
-    "permissions": [
-      "#zone:read",
-      "#zone:edit"
-    ],
-    "plan": {
-      "id": "e592fd9519420ba7405e1307bff33214",
-      "name": "Pro Plan",
-      "price": 20,
-      "currency": "USD",
-      "frequency": "monthly",
-      "legacy_id": "pro",
-      "is_subscribed": true,
-      "can_subscribe": true
-    },
-    "plan_pending": {
-      "id": "e592fd9519420ba7405e1307bff33214",
-      "name": "Pro Plan",
-      "price": 20,
-      "currency": "USD",
-      "frequency": "monthly",
-      "legacy_id": "pro",
-      "is_subscribed": true,
-      "can_subscribe": true
-    },
-    "status": "active",
-    "paused": false,
-    "type": "full",
-    "name_servers": [
-      "tony.ns.cloudflare.com",
-      "woz.ns.cloudflare.com"
-    ]
-  }
-}

tests/Fixtures/Endpoints/listHostnames.json

@@ -1,28 +0,0 @@
-{
-  "success": true,
-  "errors": [
-    {}
-  ],
-  "messages": [
-    {}
-  ],
-  "result": [
-    {
-      "id": "0d89c70d-ad9f-4843-b99f-6cc0252067e9",
-      "hostname": "app.example.com",
-      "ssl": {
-        "status": "pending_validation",
-        "method": "http",
-        "type": "dv",
-        "cname_target": "dcv.digicert.com",
-        "cname": "810b7d5f01154524b961ba0cd578acc2.app.example.com"
-      }
-    }
-  ],
-  "result_info": {
-    "page": 1,
-    "per_page": 20,
-    "count": 1,
-    "total_count": 2000
-  }
-}

tests/Fixtures/Endpoints/listMemberships.json

@@ -1,78 +0,0 @@
-{
-    "success": true,
-    "errors": [],
-    "messages": [],
-    "result": [
-    {
-        "id": "4536bcfad5faccb111b47003c79917fa",
-        "code": "05dd05cce12bbed97c0d87cd78e89bc2fd41a6cee72f27f6fc84af2e45c0fac0",
-        "status": "accepted",
-        "account": {
-            "id": "01a7362d577a6c3019a474fd6f485823",
-            "name": "Demo Account",
-            "settings": {
-                "enforce_twofactor": false
-            }
-        },
-        "roles": [
-            "Account Administrator"
-        ],
-        "permissions": {
-            "analytics": {
-                "read": true,
-                "write": true
-            },
-            "billing": {
-                "read": true,
-                "write": true
-            },
-            "cache_purge": {
-                "read": true,
-                "write": true
-            },
-            "dns": {
-                "read": true,
-                "write": true
-            },
-            "dns_records": {
-                "read": true,
-                "write": true
-            },
-            "lb": {
-                "read": true,
-                "write": true
-            },
-            "logs": {
-                "read": true,
-                "write": true
-            },
-            "organization": {
-                "read": true,
-                "write": true
-            },
-            "ssl": {
-                "read": true,
-                "write": true
-            },
-            "waf": {
-                "read": true,
-                "write": true
-            },
-            "zones": {
-                "read": true,
-                "write": true
-            },
-            "zone_settings": {
-                "read": true,
-                "write": true
-            }
-        }
-    }
-    ],
-    "result_info": {
-        "page": 1,
-        "per_page": 20,
-        "count": 1,
-        "total_count": 2000
-    }
-}

tests/Fixtures/Endpoints/updateHostname.json

@@ -1,20 +0,0 @@
-{
-  "success": true,
-  "errors": [
-    {}
-  ],
-  "messages": [
-    {}
-  ],
-  "result": {
-    "id": "0d89c70d-ad9f-4843-b99f-6cc0252067e9",
-    "hostname": "app.example.com",
-    "ssl": {
-      "status": "pending_validation",
-      "method": "http",
-      "type": "dv",
-      "cname_target": "dcv.digicert.com",
-      "cname": "810b7d5f01154524b961ba0cd578acc2.app.example.com"
-    }
-  }
-}

tests/Fixtures/Endpoints/updateMembershipStatus.json

@@ -1,70 +0,0 @@
-{
-  "success": true,
-  "errors": [],
-  "messages": [],
-  "result": {
-    "id": "4536bcfad5faccb111b47003c79917fa",
-    "code": "05dd05cce12bbed97c0d87cd78e89bc2fd41a6cee72f27f6fc84af2e45c0fac0",
-    "status": "accepted",
-    "account": {
-      "id": "01a7362d577a6c3019a474fd6f485823",
-      "name": "Demo Account",
-      "settings": {
-        "enforce_twofactor": false
-      }
-    },
-    "roles": [
-      "Account Administrator"
-    ],
-    "permissions": {
-      "analytics": {
-        "read": true,
-        "write": true
-      },
-      "billing": {
-        "read": true,
-        "write": true
-      },
-      "cache_purge": {
-        "read": true,
-        "write": true
-      },
-      "dns": {
-        "read": true,
-        "write": true
-      },
-      "dns_records": {
-        "read": true,
-        "write": true
-      },
-      "lb": {
-        "read": true,
-        "write": true
-      },
-      "logs": {
-        "read": true,
-        "write": true
-      },
-      "organization": {
-        "read": true,
-        "write": true
-      },
-      "ssl": {
-        "read": true,
-        "write": true
-      },
-      "waf": {
-        "read": true,
-        "write": true
-      },
-      "zones": {
-        "read": true,
-        "write": true
-      },
-      "zone_settings": {
-        "read": true,
-        "write": true
-      }
-    }
-  }
-}

tests/TestCase.php

@@ -1,12 +1,11 @@
 <?php
 use GuzzleHttp\Psr7;
-use PHPUnit\Framework\TestCase as BaseTestCase;
 
 /**
  * Class TestCase
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-abstract class TestCase extends BaseTestCase
+abstract class TestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * Returns a PSR7 Stream for a given fixture.