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

@@ -26,7 +26,7 @@ class Railgun implements API
'name' => $name,
];
$user = $this->adapter->post('railguns', [], $query);
$user = $this->adapter->post('railguns', $query);
$body = json_decode($user->getBody());
return $body;
@@ -46,7 +46,7 @@ class Railgun implements API
$query['direction'] = $direction;
}
$user = $this->adapter->get('railguns', $query, []);
$user = $this->adapter->get('railguns', $query);
$body = json_decode($user->getBody());
return (object)['result' => $body->result, 'result_info' => $body->result_info];
@@ -55,7 +55,7 @@ class Railgun implements API
public function get(
string $railgunID
): \stdClass {
$user = $this->adapter->get('railguns/' . $railgunID, [], []);
$user = $this->adapter->get('railguns/' . $railgunID);
$body = json_decode($user->getBody());
return $body->result;
@@ -64,7 +64,7 @@ class Railgun implements API
public function getZones(
string $railgunID
): \stdClass {
$user = $this->adapter->get('railguns/' . $railgunID . '/zones', [], []);
$user = $this->adapter->get('railguns/' . $railgunID . '/zones');
$body = json_decode($user->getBody());
return (object)['result' => $body->result, 'result_info' => $body->result_info];
@@ -78,7 +78,7 @@ class Railgun implements API
'enabled' => $status
];
$user = $this->adapter->patch('railguns/' . $railgunID, [], $query);
$user = $this->adapter->patch('railguns/' . $railgunID, $query);
$body = json_decode($user->getBody());
return $body->result;
@@ -87,7 +87,7 @@ class Railgun implements API
public function delete(
string $railgunID
): bool {
$user = $this->adapter->delete('railguns/' . $railgunID, [], []);
$user = $this->adapter->delete('railguns/' . $railgunID);
$body = json_decode($user->getBody());
if (isset($body->result->id)) {