Merge pull request #38 from kleisauke/cleanup

Cleanup / fixes
This commit is contained in:
Junade
2017-11-25 11:49:35 +08:00
committed by GitHub
33 changed files with 232 additions and 289 deletions

View File

@@ -14,28 +14,28 @@ class PageRulesActions implements Configurations
public function setAlwaysOnline(bool $active)
{
$this->addConfigurationOption("always_online", [
$this->addConfigurationOption('always_online', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setAlwaysUseHTTPS(bool $active)
{
$this->addConfigurationOption("always_use_https", [
$this->addConfigurationOption('always_use_https', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setBrowserCacheTTL(int $ttl)
{
$this->addConfigurationOption("browser_cache_ttl", [
$this->addConfigurationOption('browser_cache_ttl', [
'value' => $ttl
]);
}
public function setBrowserIntegrityCheck(bool $active)
{
$this->addConfigurationOption("browser_check", [
$this->addConfigurationOption('browser_check', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
@@ -43,35 +43,35 @@ class PageRulesActions implements Configurations
public function setBypassCacheOnCookie(string $value)
{
if (preg_match('/^([a-zA-Z0-9\.=|_*-]+)$/i', $value) < 1) {
throw new ConfigurationsException("Invalid cookie string.");
throw new ConfigurationsException('Invalid cookie string.');
}
$this->addConfigurationOption("bypass_cache_on_cookie", [
$this->addConfigurationOption('bypass_cache_on_cookie', [
'value' => $value
]);
}
public function setCacheByDeviceType(bool $active)
{
$this->addConfigurationOption("cache_by_device_type", [
$this->addConfigurationOption('cache_by_device_type', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setCacheKey(string $value)
{
$this->addConfigurationOption("cache_key", [
$this->addConfigurationOption('cache_key', [
'value' => $value
]);
}
public function setCacheLevel(string $value)
{
if (!in_array($value, ["bypass", "basic", "simplified", "aggressive", "cache_everything"])) {
throw new ConfigurationsException("Invalid cache level");
if (!in_array($value, ['bypass', 'basic', 'simplified', 'aggressive', 'cache_everything'])) {
throw new ConfigurationsException('Invalid cache level');
}
$this->addConfigurationOption("cache_level", [
$this->addConfigurationOption('cache_level', [
'value' => $value
]);
}
@@ -79,31 +79,31 @@ class PageRulesActions implements Configurations
public function setCacheOnCookie(string $value)
{
if (preg_match('/^([a-zA-Z0-9\.=|_*-]+)$/i', $value) < 1) {
throw new ConfigurationsException("Invalid cookie string.");
throw new ConfigurationsException('Invalid cookie string.');
}
$this->addConfigurationOption("cache_on_cookie", [
$this->addConfigurationOption('cache_on_cookie', [
'value' => $value
]);
}
public function setDisableApps(bool $active)
{
$this->addConfigurationOption("disable_apps", [
$this->addConfigurationOption('disable_apps', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setDisablePerformance(bool $active)
{
$this->addConfigurationOption("disable_performance", [
$this->addConfigurationOption('disable_performance', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setDisableSecurity(bool $active)
{
$this->addConfigurationOption("disable_security", [
$this->addConfigurationOption('disable_security', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
@@ -111,17 +111,17 @@ class PageRulesActions implements Configurations
public function setEdgeCacheTTL(int $value)
{
if ($value > 2419200) {
throw new ConfigurationsException("Edge Cache TTL too high.");
throw new ConfigurationsException('Edge Cache TTL too high.');
}
$this->addConfigurationOption("edge_cache_ttl", [
$this->addConfigurationOption('edge_cache_ttl', [
'value' => $value
]);
}
public function setEmailObfuscation(bool $active)
{
$this->addConfigurationOption("disable_security", [
$this->addConfigurationOption('disable_security', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
@@ -132,7 +132,7 @@ class PageRulesActions implements Configurations
throw new ConfigurationsException('Status Codes can only be 301 or 302.');
}
$this->addConfigurationOption("forwarding_url", [
$this->addConfigurationOption('forwarding_url', [
'status_code' => $statusCode,
'url' => $forwardingUrl,
]);
@@ -140,28 +140,28 @@ class PageRulesActions implements Configurations
public function setHostHeaderOverride(bool $active)
{
$this->addConfigurationOption("host_header_override", [
$this->addConfigurationOption('host_header_override', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setHotlinkProtection(bool $active)
{
$this->addConfigurationOption("hotlink_protection", [
$this->addConfigurationOption('hotlink_protection', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setIPGeoLocationHeader(bool $active)
{
$this->addConfigurationOption("ip_geolocation", [
$this->addConfigurationOption('ip_geolocation', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setMinification(bool $html, bool $css, bool $javascript)
{
$this->addConfigurationOption("minification", [
$this->addConfigurationOption('minification', [
'html' => $this->getBoolAsOnOrOff($html),
'css' => $this->getBoolAsOnOrOff($css),
'js' => $this->getBoolAsOnOrOff($javascript),
@@ -170,124 +170,124 @@ class PageRulesActions implements Configurations
public function setMirage(bool $active)
{
$this->addConfigurationOption("mirage", [
$this->addConfigurationOption('mirage', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setOriginErrorPagePassthru(bool $active)
{
$this->addConfigurationOption("origin_error_page_pass_thru", [
$this->addConfigurationOption('origin_error_page_pass_thru', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setQueryStringSort(bool $active)
{
$this->addConfigurationOption("sort_query_string_for_cache", [
$this->addConfigurationOption('sort_query_string_for_cache', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setDisableRailgun(bool $active)
{
$this->addConfigurationOption("disable_railgun", [
$this->addConfigurationOption('disable_railgun', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setResolveOverride(bool $value)
{
$this->addConfigurationOption("resolve_override", [
$this->addConfigurationOption('resolve_override', [
'value' => $value
]);
}
public function setRespectStrongEtag(bool $active)
{
$this->addConfigurationOption("respect_strong_etag", [
$this->addConfigurationOption('respect_strong_etag', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setResponseBuffering(bool $active)
{
$this->addConfigurationOption("response_buffering", [
$this->addConfigurationOption('response_buffering', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setRocketLoader(string $value)
{
if (!in_array($value, ["off", "manual", "automatic"])) {
if (!in_array($value, ['off', 'manual', 'automatic'])) {
throw new ConfigurationsException('Rocket Loader can only be off, automatic, or manual.');
}
$this->addConfigurationOption("rocket_loader", [
$this->addConfigurationOption('rocket_loader', [
'value' => $value
]);
}
public function setSecurityLevel(string $value)
{
if (!in_array($value, ["off", "essentially_off", "low", "medium", "high", "under_attack"])) {
if (!in_array($value, ['off', 'essentially_off', 'low', 'medium', 'high', 'under_attack'])) {
throw new ConfigurationsException('Can only be set to off, essentially_off, low, medium, high or under_attack.');
}
$this->addConfigurationOption("security_level", [
$this->addConfigurationOption('security_level', [
'value' => $value
]);
}
public function setServerSideExcludes(bool $active)
{
$this->addConfigurationOption("server_side_exclude", [
$this->addConfigurationOption('server_side_exclude', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setSmartErrors(bool $active)
{
$this->addConfigurationOption("smart_errors", [
$this->addConfigurationOption('smart_errors', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setSSL(string $value)
{
if (!in_array($value, ["off", "flexible", "full", "strict", "origin_pull"])) {
if (!in_array($value, ['off', 'flexible', 'full', 'strict', 'origin_pull'])) {
throw new ConfigurationsException('Can only be set to off, flexible, full, strict, origin_pull.');
}
$this->addConfigurationOption("smart_errors", [
$this->addConfigurationOption('smart_errors', [
'value' => $value
]);
}
public function setTrueClientIpHeader(bool $active)
{
$this->addConfigurationOption("true_client_ip_header", [
$this->addConfigurationOption('true_client_ip_header', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setWAF(bool $active)
{
$this->addConfigurationOption("waf", [
$this->addConfigurationOption('waf', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setAutomatedHTTPSRewrites(bool $active)
{
$this->addConfigurationOption("automatic_https_rewrites", [
$this->addConfigurationOption('automatic_https_rewrites', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
public function setOpportunisticEncryption(bool $active)
{
$this->addConfigurationOption("opportunistic_encryption", [
$this->addConfigurationOption('opportunistic_encryption', [
'value' => $this->getBoolAsOnOrOff($active)
]);
}
@@ -301,7 +301,7 @@ class PageRulesActions implements Configurations
{
$configuration['id'] = $setting;
array_push($this->configs, (object) $configuration);
$this->configs[] = (object) $configuration;
}
private function getBoolAsOnOrOff(bool $value): string

View File

@@ -14,13 +14,15 @@ class PageRulesTargets implements Configurations
public function __construct(string $queryUrl)
{
$target = new \stdClass();
$target->target = 'url';
$target->constraint = new \stdClass();
$target->constraint->operator = "matches";
$target->constraint->value = $queryUrl;
$this->targets = [$target];
$this->targets = [
(object)[
'target' => 'url',
'constraint' => (object)[
'operator' => 'matches',
'value' => $queryUrl
]
]
];
}
public function getArray(): array

View File

@@ -14,11 +14,7 @@ class UARules implements Configurations
public function addUA(string $value)
{
$object = new \stdClass();
$object->target = "ua";
$object->value = $value;
array_push($this->configs, $object);
$this->configs[] = (object)['target' => 'ua', 'value' => $value];
}
public function getArray(): array

View File

@@ -14,20 +14,12 @@ class ZoneLockdown implements Configurations
public function addIP(string $value)
{
$object = new \stdClass();
$object->target = "ip";
$object->value = $value;
array_push($this->configs, $object);
$this->configs[] = (object)['target' => 'ip', 'value' => $value];
}
public function addIPRange(string $value)
{
$object = new \stdClass();
$object->target = "ip_range";
$object->value = $value;
array_push($this->configs, $object);
$this->configs[] = (object)['target' => 'ip_range', 'value' => $value];
}
public function getArray(): array