Code cleanup / Quality of Life updates

Adapter::get, post, put, patch and delete all had non-optional parameters for $headers and $query or $body. These have been made optional. I also re-ordered the parameters as $headers was never used while $query/$body were heavily used. I also condensed and removed some duplicate calls so that every call to Adapter::get/post sends that call to Adapter::request. It could use a magic method to do this but it might make it more difficult to test.
2018-04-12 23:11:04 -04:00
parent 35ce8eadf1
commit cca073c809
31 changed files with 169 additions and 263 deletions
--- a/tests/Adapter/GuzzleTest.php
+++ b/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,7 +65,6 @@ class GuzzleTest extends TestCase
    {
        $response = $this->client->patch(
            'https://httpbin.org/patch',
-            [],
            ['X-Patch-Test' => 'Testing a PATCH request.']
        );

@@ -80,7 +79,6 @@ class GuzzleTest extends TestCase
    {
        $response = $this->client->delete(
            'https://httpbin.org/delete',
-            [],
            ['X-Delete-Test' => 'Testing a DELETE request.']
        );

--- a/tests/Configurations/ConfigurationsUARulesTest.php
+++ b/tests/Configurations/ConfigurationsUARulesTest.php
@@ -16,12 +16,12 @@ class ConfigurationsUARulesTest extends TestCase
        $array = $configuration->getArray();
        $this->assertCount(1, $array);

-        $this->assertObjectHasAttribute('target', $array[0]);
-        $this->assertEquals('ua', $array[0]->target);
-        $this->assertObjectHasAttribute('value', $array[0]);
+        $this->assertArrayHasKey('target', $array[0]);
+        $this->assertEquals('ua', $array[0]['target']);
+        $this->assertArrayHasKey('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']
        );
    }
 }
--- a/tests/Configurations/ConfigurationsZoneLockdownTest.php
+++ b/tests/Configurations/ConfigurationsZoneLockdownTest.php
@@ -16,19 +16,19 @@ class ConfigurationsZoneLockdownTest extends TestCase
        $array = $configuration->getArray();
        $this->assertCount(1, $array);

-        $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);
+        $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']);

        $configuration->addIPRange('1.2.3.4/24');

        $array = $configuration->getArray();
        $this->assertCount(2, $array);

-        $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);
+        $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']);
    }
 }
--- a/tests/Configurations/PageRulesTargetTest.php
+++ b/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']);
    }
 }
--- a/tests/Endpoints/AccessRulesTest.php
+++ b/tests/Endpoints/AccessRulesTest.php
@@ -17,8 +17,7 @@ class AccessRulesTest extends TestCase
                    'page' => 1,
                    'per_page' => 50,
                    'match' => 'all'
-                ]),
-                $this->equalTo([])
+                ])
            );

        $zones = new \Cloudflare\API\Endpoints\AccessRules($mock);
@@ -45,10 +44,9 @@ class AccessRulesTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules'),
-                $this->equalTo([]),
                $this->equalTo([
                    'mode' => 'challenge',
-                    'configuration' => (object) $config->getArray(),
+                    'configuration' => $config->getArray(),
                    'notes' => 'This rule is on because of an event that occured on date X',
                ])
            );
@@ -73,7 +71,6 @@ 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',
@@ -100,7 +97,6 @@ class AccessRulesTest extends TestCase
            ->method('delete')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/access_rules/rules/92f17202ed8bd63d69a66b86a49a8f6b'),
-                $this->equalTo([]),
                $this->equalTo([
                    'cascade' => 'none'
                ])
--- a/tests/Endpoints/CustomHostnamesTest.php
+++ b/tests/Endpoints/CustomHostnamesTest.php
@@ -21,10 +21,9 @@ class CustomHostnamesTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames'),
-                $this->equalTo([]),
                $this->equalTo([
                    'hostname' => 'app.example.com',
-                    'ssl' => (object)[
+                    'ssl' => [
                        'method' => 'http',
                        'type' => 'dv'
                    ]
@@ -54,8 +53,7 @@ class CustomHostnamesTest extends TestCase
                    'order' => 'ssl',
                    'direction' => 'desc',
                    'ssl' => 0
-                ]),
-                $this->equalTo([])
+                ])
            );

        $zones = new \Cloudflare\API\Endpoints\CustomHostnames($mock);
@@ -78,9 +76,7 @@ class CustomHostnamesTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9')
            );

        $zones = new \Cloudflare\API\Endpoints\CustomHostnames($mock);
@@ -101,9 +97,8 @@ class CustomHostnamesTest extends TestCase
            ->method('patch')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9'),
-                $this->equalTo([]),
                $this->equalTo([
-                    'ssl' => (object)[
+                    'ssl' => [
                        'method' => 'http',
                        'type' =>  'dv'
                    ]
@@ -127,9 +122,7 @@ class CustomHostnamesTest extends TestCase
        $mock->expects($this->once())
            ->method('delete')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/custom_hostnames/0d89c70d-ad9f-4843-b99f-6cc0252067e9')
            );

        $zones = new \Cloudflare\API\Endpoints\CustomHostnames($mock);
--- a/tests/Endpoints/DNSTest.php
+++ b/tests/Endpoints/DNSTest.php
@@ -19,7 +19,6 @@ class DNSTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records'),
-                $this->equalTo([]),
                $this->equalTo([
                    'type' => 'A',
                    'name' => 'example.com',
@@ -44,16 +43,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([])
+                $this->equalTo([
+                    'page' => 1,
+                    'per_page' => 20,
+                    'match' => 'all',
+                    'type' => 'A',
+                    'name' => 'example.com',
+                    'content' => '127.0.0.1',
+                    'order' => 'type',
+                    'direction' => 'desc',
+                ])
            );

        $zones = new \Cloudflare\API\Endpoints\DNS($mock);
@@ -76,8 +75,7 @@ class DNSTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59'),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59')
            );

        $dns = new \Cloudflare\API\Endpoints\DNS($mock);
@@ -105,7 +103,6 @@ class DNSTest extends TestCase
            ->method('put')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59'),
-                $this->equalTo([]),
                $this->equalTo($details)
            );

--- a/tests/Endpoints/IPsTest.php
+++ b/tests/Endpoints/IPsTest.php
@@ -18,8 +18,7 @@ class IPsTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('ips'),
-                $this->equalTo([])
+                $this->equalTo('ips')
            );

        $ips = new \Cloudflare\API\Endpoints\IPs($mock);
--- a/tests/Endpoints/PageRulesTest.php
+++ b/tests/Endpoints/PageRulesTest.php
@@ -23,7 +23,6 @@ class PageRulesTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules'),
-                $this->equalTo([]),
                $this->equalTo([
                    'targets' => $target->getArray(),
                    'actions' => $action->getArray(),
@@ -54,8 +53,7 @@ class PageRulesTest extends TestCase
                'order' => 'status',
                'direction' => 'desc',
                'match' => 'all'
-              ]),
-              $this->equalTo([])
+              ])
            );

        $pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
@@ -72,8 +70,7 @@ class PageRulesTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac'),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac')
            );

        $pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
@@ -95,7 +92,6 @@ class PageRulesTest extends TestCase
            ->method('patch')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules'),
-                $this->equalTo([]),
                $this->equalTo([
                    'targets' => $target->getArray(),
                    'actions' => $action->getArray(),
@@ -120,9 +116,7 @@ class PageRulesTest extends TestCase
        $mock->expects($this->once())
            ->method('delete')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/pagerules/9a7806061c88ada191ed06f989cc3dac')
            );

        $pageRules = new \Cloudflare\API\Endpoints\PageRules($mock);
--- a/tests/Endpoints/RailgunTest.php
+++ b/tests/Endpoints/RailgunTest.php
@@ -23,7 +23,6 @@ class RailgunTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('railguns'),
-                $this->equalTo([]),
                $this->equalTo(['name' => $details['name']])
            );

@@ -52,8 +51,7 @@ class RailgunTest extends TestCase
                    'page' => 1,
                    'per_page' => 20,
                    'direction' => 'desc'
-                ]),
-                $this->equalTo([])
+                ])
            );

        $railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
@@ -73,8 +71,7 @@ class RailgunTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('railguns/e928d310693a83094309acf9ead50448'),
-                $this->equalTo([])
+                $this->equalTo('railguns/e928d310693a83094309acf9ead50448')
            );

        $railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
@@ -93,9 +90,7 @@ class RailgunTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('railguns/e928d310693a83094309acf9ead50448/zones'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('railguns/e928d310693a83094309acf9ead50448/zones')
            );

        $railgun = new \Cloudflare\API\Endpoints\Railgun($mock);
@@ -120,7 +115,6 @@ class RailgunTest extends TestCase
            ->method('patch')
            ->with(
                $this->equalTo('railguns/e928d310693a83094309acf9ead50448'),
-                $this->equalTo([]),
                $this->equalTo($details)
            );

@@ -140,9 +134,7 @@ class RailgunTest extends TestCase
        $mock->expects($this->once())
            ->method('delete')
            ->with(
-                $this->equalTo('railguns/e928d310693a83094309acf9ead50448'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('railguns/e928d310693a83094309acf9ead50448')
            );

        $waf = new \Cloudflare\API\Endpoints\Railgun($mock);
--- a/tests/Endpoints/UARulesTest.php
+++ b/tests/Endpoints/UARulesTest.php
@@ -22,8 +22,7 @@ class UARulesTest extends TestCase
              $this->equalTo([
                'page' => 1,
                'per_page' => 20
-              ]),
-              $this->equalTo([])
+              ])
            );

        $zones = new \Cloudflare\API\Endpoints\UARules($mock);
@@ -50,7 +49,6 @@ class UARulesTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules'),
-                $this->equalTo([]),
                $this->equalTo([
                    'mode' => 'js_challenge',
                    'id' => '372e67954025e0ba6aaa6d586b9e0b59',
@@ -79,8 +77,7 @@ class UARulesTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59'),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59')
            );

        $lockdown = new \Cloudflare\API\Endpoints\UARules($mock);
@@ -103,7 +100,6 @@ class UARulesTest extends TestCase
            ->method('put')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59'),
-                $this->equalTo([]),
                $this->equalTo([
                    'mode' => 'js_challenge',
                    'id' => '372e67954025e0ba6aaa6d586b9e0b59',
@@ -132,9 +128,7 @@ class UARulesTest extends TestCase
        $mock->expects($this->once())
            ->method('delete')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/ua_rules/372e67954025e0ba6aaa6d586b9e0b59')
            );

        $rules = new \Cloudflare\API\Endpoints\UARules($mock);
--- a/tests/Endpoints/UserTest.php
+++ b/tests/Endpoints/UserTest.php
@@ -56,7 +56,7 @@ class UserTest extends TestCase

        $mock->expects($this->once())
            ->method('patch')
-            ->with($this->equalTo('user'), $this->equalTo([]), $this->equalTo(['email' => 'user2@example.com']));
+            ->with($this->equalTo('user'), $this->equalTo(['email' => 'user2@example.com']));

        $user = new \Cloudflare\API\Endpoints\User($mock);
        $user->updateUserDetails(['email' => 'user2@example.com']);
--- a/tests/Endpoints/WAFTest.php
+++ b/tests/Endpoints/WAFTest.php
@@ -25,8 +25,7 @@ class WAFTest extends TestCase
                    'match' => 'all',
                    'order' => 'status',
                    'direction' => 'desc'
-                ]),
-                $this->equalTo([])
+                ])
            );

        $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -49,8 +48,7 @@ class WAFTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b'),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b')
            );

        $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -76,8 +74,7 @@ class WAFTest extends TestCase
                    'match' => 'all',
                    'order' => 'status',
                    'direction' => 'desc'
-                ]),
-                $this->equalTo([])
+                ])
            );

        $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -100,8 +97,7 @@ class WAFTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/rules/f939de3be84e66e757adcdcb87908023'),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/rules/f939de3be84e66e757adcdcb87908023')
            );

        $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -125,7 +121,6 @@ class WAFTest extends TestCase
            ->method('patch')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/rules/f939de3be84e66e757adcdcb87908023'),
-                $this->equalTo([]),
                $this->equalTo($details)
            );

@@ -156,8 +151,7 @@ class WAFTest extends TestCase
                    'match' => 'all',
                    'order' => 'status',
                    'direction' => 'desc'
-                ]),
-                $this->equalTo([])
+                ])
            );

        $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -180,8 +174,7 @@ class WAFTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/groups/de677e5818985db1285d0e80225f06e5'),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/groups/de677e5818985db1285d0e80225f06e5')
            );

        $waf = new \Cloudflare\API\Endpoints\WAF($mock);
@@ -205,7 +198,6 @@ class WAFTest extends TestCase
            ->method('patch')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/waf/packages/a25a9a7e9c00afc1fb2e0245519d725b/groups/de677e5818985db1285d0e80225f06e5'),
-                $this->equalTo([]),
                $this->equalTo($details)
            );

--- a/tests/Endpoints/ZoneLockdownTest.php
+++ b/tests/Endpoints/ZoneLockdownTest.php
@@ -19,11 +19,10 @@ class ZoneLockdownTest extends TestCase
            ->method('get')
            ->with(
                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns'),
-              $this->equalTo([
-                'page' => 1,
-                'per_page' => 20,
-              ]),
-              $this->equalTo([])
+                $this->equalTo([
+                    'page' => 1,
+                    'per_page' => 20,
+                ])
            );

        $zones = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
@@ -50,7 +49,6 @@ 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',
@@ -79,8 +77,7 @@ class ZoneLockdownTest extends TestCase
        $mock->expects($this->once())
            ->method('get')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59'),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59')
            );

        $lockdown = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
@@ -103,7 +100,6 @@ 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',
@@ -135,9 +131,7 @@ class ZoneLockdownTest extends TestCase
        $mock->expects($this->once())
            ->method('delete')
            ->with(
-                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('zones/023e105f4ecef8ad9ca31a8372d0c353/firewall/lockdowns/372e67954025e0ba6aaa6d586b9e0b59')
            );

        $zoneLockdown = new \Cloudflare\API\Endpoints\ZoneLockdown($mock);
--- a/tests/Endpoints/ZonesTest.php
+++ b/tests/Endpoints/ZonesTest.php
@@ -19,7 +19,6 @@ class ZonesTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('zones'),
-                $this->equalTo([]),
                $this->equalTo(['name' => 'example.com', 'jump_start' => false])
            );

@@ -38,11 +37,10 @@ class ZonesTest extends TestCase
            ->method('post')
            ->with(
                $this->equalTo('zones'),
-                $this->equalTo([]),
                $this->equalTo([
                    'name' => 'example.com',
                    'jump_start' => true,
-                    'organization' => (object)['id' => '01a7362d577a6c3019a474fd6f485823']
+                    'organization' => ['id' => '01a7362d577a6c3019a474fd6f485823']
                ])
            );

@@ -60,9 +58,7 @@ class ZonesTest extends TestCase
        $mock->expects($this->once())
            ->method('put')
            ->with(
-                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/activation_check'),
-                $this->equalTo([]),
-                $this->equalTo([])
+                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/activation_check')
            );

        $zones = new \Cloudflare\API\Endpoints\Zones($mock);
@@ -82,16 +78,15 @@ 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([])
+                $this->equalTo([
+                    'page' => 1,
+                    'per_page' => 20,
+                    'match' => 'all',
+                    'name' => 'example.com',
+                    'status' => 'active',
+                    'order' => 'status',
+                    'direction' => 'desc',
+                ])
            );

        $zones = new \Cloudflare\API\Endpoints\Zones($mock);
@@ -115,13 +110,12 @@ class ZonesTest extends TestCase
            ->method('get')
            ->with(
                $this->equalTo('zones'),
-              $this->equalTo([
-                'page' => 1,
-                'per_page' => 20,
-                'match' => 'all',
-                'name' => 'example.com',
-                ]),
-              $this->equalTo([])
+                $this->equalTo([
+                    'page' => 1,
+                    'per_page' => 20,
+                    'match' => 'all',
+                    'name' => 'example.com',
+                ])
            );

        $zones = new \Cloudflare\API\Endpoints\Zones($mock);
@@ -141,8 +135,7 @@ 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([])
+                $this->equalTo(['since' => '-10080', 'until' => '0', 'continuous' => var_export(true, true)])
            );

        $zones = new \Cloudflare\API\Endpoints\Zones($mock);
@@ -163,7 +156,6 @@ class ZonesTest extends TestCase
            ->method('patch')
            ->with(
                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/settings/development_mode'),
-                $this->equalTo([]),
                $this->equalTo(['value' => 'on'])
            );

@@ -184,7 +176,6 @@ class ZonesTest extends TestCase
            ->method('delete')
            ->with(
                $this->equalTo('zones/c2547eb745079dac9320b638f5e225cf483cc5cfdda41/purge_cache'),
-                $this->equalTo([]),
                $this->equalTo(['purge_everything' => true])
            );