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.
This commit is contained in:
Darin Randal
2018-04-12 23:11:04 -04:00
parent 35ce8eadf1
commit cca073c809
31 changed files with 169 additions and 263 deletions

View File

@@ -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'
])