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:
@@ -52,7 +52,7 @@ class PageRules implements API
|
||||
}
|
||||
|
||||
|
||||
$query = $this->adapter->post('zones/' . $zoneID . '/pagerules', [], $options);
|
||||
$query = $this->adapter->post('zones/' . $zoneID . '/pagerules', $options);
|
||||
|
||||
$body = json_decode($query->getBody());
|
||||
|
||||
@@ -93,7 +93,7 @@ class PageRules implements API
|
||||
'match' => $match
|
||||
];
|
||||
|
||||
$user = $this->adapter->get('zones/' . $zoneID . '/pagerules', $query, []);
|
||||
$user = $this->adapter->get('zones/' . $zoneID . '/pagerules', $query);
|
||||
$body = json_decode($user->getBody());
|
||||
|
||||
return $body->result;
|
||||
@@ -101,7 +101,7 @@ class PageRules implements API
|
||||
|
||||
public function getPageRuleDetails(string $zoneID, string $ruleID): \stdClass
|
||||
{
|
||||
$user = $this->adapter->get('zones/' . $zoneID . '/pagerules/' . $ruleID, [], []);
|
||||
$user = $this->adapter->get('zones/' . $zoneID . '/pagerules/' . $ruleID);
|
||||
$body = json_decode($user->getBody());
|
||||
return $body->result;
|
||||
}
|
||||
@@ -132,7 +132,7 @@ class PageRules implements API
|
||||
}
|
||||
|
||||
|
||||
$query = $this->adapter->patch('zones/' . $zoneID . '/pagerules', [], $options);
|
||||
$query = $this->adapter->patch('zones/' . $zoneID . '/pagerules', $options);
|
||||
|
||||
$body = json_decode($query->getBody());
|
||||
|
||||
@@ -145,7 +145,7 @@ 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);
|
||||
|
||||
$body = json_decode($user->getBody());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user