YueMi-Development/cloudflare-php
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #38 from kleisauke/cleanup

Browse Source 
Cleanup / fixes
This commit is contained in:
Junade
2017-11-25 11:49:35 +08:00
committed by GitHub
parent c8e85d2582 ff42f334a5
commit d00a1d3f44
33 changed files with 232 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Endpoints/DNS.php
View File

@@ -62,14 +62,14 @@ class DNS implements API
public function listRecords(
string $zoneID,
string $type = "",
string $name = "",
string $content = "",
string $type = '',
string $name = '',
string $content = '',
int $page = 1,
int $perPage = 20,
string $order = "",
string $direction = "",
string $match = "all"
string $order = '',
string $direction = '',
string $match = 'all'
): \stdClass {
$query = [
'page' => $page,
@@ -100,11 +100,7 @@ class DNS implements API
$user = $this->adapter->get('zones/' . $zoneID . '/dns_records', $query, []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function getRecordDetails(string $zoneID, string $recordID): \stdClass

10
src/Endpoints/PageRules.php
View File

@@ -70,19 +70,19 @@ class PageRules implements API
string $direction = null,
string $match = null
): array {
if (is_null($status) && !in_array($status, ['active', 'disabled'])) {
if ($status === null && !in_array($status, ['active', 'disabled'])) {
throw new EndpointException('Page Rules can only be listed by status of active or disabled.');
}
if (is_null($order) && !in_array($order, ['status', 'priority'])) {
if ($order === null && !in_array($order, ['status', 'priority'])) {
throw new EndpointException('Page Rules can only be ordered by status or priority.');
}
if (is_null($direction) && !in_array($direction, ['asc', 'desc'])) {
if ($direction === null && !in_array($direction, ['asc', 'desc'])) {
throw new EndpointException('Direction of Page Rule ordering can only be asc or desc.');
}
if (is_null($match) && !in_array($match, ['all', 'any'])) {
if ($match === null && !in_array($match, ['all', 'any'])) {
throw new EndpointException('Match can only be any or all.');
}
@@ -115,7 +115,7 @@ class PageRules implements API
): bool {
$options = [];
if ($active !== null) {
if ($target !== null) {
$options['targets'] = $target->getArray();
}

14
src/Endpoints/Railgun.php
View File

@@ -35,7 +35,7 @@ class Railgun implements API
public function list(
int $page = 1,
int $perPage = 20,
string $direction = ""
string $direction = ''
): \stdClass {
$query = [
'page' => $page,
@@ -49,11 +49,7 @@ class Railgun implements API
$user = $this->adapter->get('railguns', $query, []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function get(
@@ -71,11 +67,7 @@ class Railgun implements API
$user = $this->adapter->get('railguns/' . $railgunID . '/zones', [], []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function update(

11
src/Endpoints/UARules.php
View File

@@ -8,6 +8,7 @@
namespace Cloudflare\API\Endpoints;
use Cloudflare\API\Configurations\Configurations;
use Cloudflare\API\Adapter\Adapter;
class UARules implements API
@@ -32,17 +33,13 @@ class UARules implements API
$user = $this->adapter->get('zones/' . $zoneID . '/firewall/ua_rules', $query, []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function createRule(
string $zoneID,
string $mode,
\Cloudflare\API\Configurations\Configurations $configuration,
Configurations $configuration,
string $ruleID = null,
string $description = null
): bool {
@@ -72,7 +69,7 @@ class UARules implements API
public function getRuleDetails(string $zoneID, string $blockID): \stdClass
{
$user = $this->adapter->get('zones/' . $zoneID . '/firewall/ua_rules/' . $blockID, []);
$user = $this->adapter->get('zones/' . $zoneID . '/firewall/ua_rules/' . $blockID, [], []);
$body = json_decode($user->getBody());
return $body->result;
}

6
src/Endpoints/User.php
View File

@@ -27,17 +27,17 @@ class User implements API
public function getUserID(): string
{
return ($this->getUserDetails())->id;
return $this->getUserDetails()->id;
}
public function getUserEmail(): string
{
return ($this->getUserDetails())->email;
return $this->getUserDetails()->email;
}
public function updateUserDetails(array $details): \stdClass
{
$response = $this->adapter->patch("user", [], $details);
$response = $this->adapter->patch('user', [], $details);
return json_decode($response->getBody());
}
}

38
src/Endpoints/WAF.php
View File

@@ -10,7 +10,7 @@ namespace Cloudflare\API\Endpoints;
use Cloudflare\API\Adapter\Adapter;
class WAF implements \Cloudflare\API\Endpoints\API
class WAF implements API
{
private $adapter;
@@ -23,9 +23,9 @@ class WAF implements \Cloudflare\API\Endpoints\API
string $zoneID,
int $page = 1,
int $perPage = 20,
string $order = "",
string $direction = "",
string $match = "all"
string $order = '',
string $direction = '',
string $match = 'all'
): \stdClass {
$query = [
'page' => $page,
@@ -44,11 +44,7 @@ class WAF implements \Cloudflare\API\Endpoints\API
$user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages', $query, []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
@@ -67,9 +63,9 @@ class WAF implements \Cloudflare\API\Endpoints\API
string $packageID,
int $page = 1,
int $perPage = 20,
string $order = "",
string $direction = "",
string $match = "all"
string $order = '',
string $direction = '',
string $match = 'all'
): \stdClass {
$query = [
'page' => $page,
@@ -87,11 +83,7 @@ class WAF implements \Cloudflare\API\Endpoints\API
$user = $this->adapter->get('zones/' . $zoneID . '/firewall/waf/packages/' . $packageID . '/rules', $query, []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function getRuleInfo(
@@ -134,9 +126,9 @@ class WAF implements \Cloudflare\API\Endpoints\API
string $packageID,
int $page = 1,
int $perPage = 20,
string $order = "",
string $direction = "",
string $match = "all"
string $order = '',
string $direction = '',
string $match = 'all'
): \stdClass {
$query = [
'page' => $page,
@@ -159,11 +151,7 @@ class WAF implements \Cloudflare\API\Endpoints\API
);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function getGroupInfo(

6
src/Endpoints/ZoneLockdown.php
View File

@@ -32,11 +32,7 @@ class ZoneLockdown implements API
$user = $this->adapter->get('zones/' . $zoneID . '/firewall/lockdowns', $query, []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function createLockdown(

38
src/Endpoints/Zones.php
View File

@@ -35,9 +35,7 @@ class Zones implements API
];
if (!empty($organizationID)) {
$organization = new \stdClass();
$organization->id = $organizationID;
$options["organization"] = $organization;
$options['organization'] = (object)['id' => $organizationID];
}
$user = $this->adapter->post('zones', [], $options);
@@ -58,13 +56,13 @@ class Zones implements API
}
public function listZones(
string $name = "",
string $status = "",
string $name = '',
string $status = '',
int $page = 1,
int $perPage = 20,
string $order = "",
string $direction = "",
string $match = "all"
string $order = '',
string $direction = '',
string $match = 'all'
): \stdClass {
$query = [
'page' => $page,
@@ -91,19 +89,15 @@ class Zones implements API
$user = $this->adapter->get('zones', $query, []);
$body = json_decode($user->getBody());
$result = new \stdClass();
$result->result = $body->result;
$result->result_info = $body->result_info;
return $result;
return (object)['result' => $body->result, 'result_info' => $body->result_info];
}
public function getZoneID(string $name = ""): string
public function getZoneID(string $name = ''): string
{
$zones = $this->listZones($name);
if (sizeof($zones->result) < 1) {
throw new EndpointException("Could not find zones with specified name.");
if (count($zones->result) < 1) {
throw new EndpointException('Could not find zones with specified name.');
}
return $zones->result[0]->id;
@@ -118,9 +112,9 @@ class Zones implements API
* @param bool $continuous
* @return \stdClass
*/
public function getAnalyticsDashboard(string $zoneID, string $since = "-10080", string $until = "0", bool $continuous = true): \stdClass
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" => $continuous]);
$response = $this->adapter->get('zones/' . $zoneID . '/analytics/dashboard', [], ['since' => $since, 'until' => $until, 'continuous' => $continuous]);
return json_decode($response->getBody())->result;
}
@@ -134,7 +128,7 @@ 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']);
$body = json_decode($response->getBody());
@@ -153,7 +147,7 @@ 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]);
$body = json_decode($user->getBody());
@@ -166,8 +160,8 @@ class Zones implements API
public function cachePurge(string $zoneID, array $files = null, array $tags = null): bool
{
if (is_null($files) && is_null($tags)) {
throw new EndpointException("No files or tags to purge.");
if ($files === null && $tags === null) {
throw new EndpointException('No files or tags to purge.');
}
$options = [